Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Uppercase URL.
details: https://anonhg.NetBSD.org/src/rev/a2246b8ebf77
branches: trunk
changeset: 547166:a2246b8ebf77
user: wiz <wiz%NetBSD.org@localhost>
date: Wed May 14 14:30:59 2003 +0000
description:
Uppercase URL.
diffstat:
crypto/dist/heimdal/lib/krb5/krb5_krbhst_init.3 | 4 ++--
usr.bin/ftp/fetch.c | 12 ++++++------
usr.bin/ftp/ftp.1 | 10 +++++-----
usr.bin/ftp/main.c | 6 +++---
usr.sbin/pkg_install/lib/file.c | 8 ++++----
usr.sbin/pkg_install/lib/ftpio.c | 12 ++++++------
usr.sbin/sushi/functions.c | 6 +++---
7 files changed, 29 insertions(+), 29 deletions(-)
diffs (234 lines):
diff -r 1f58561c6f68 -r a2246b8ebf77 crypto/dist/heimdal/lib/krb5/krb5_krbhst_init.3
--- a/crypto/dist/heimdal/lib/krb5/krb5_krbhst_init.3 Wed May 14 14:06:06 2003 +0000
+++ b/crypto/dist/heimdal/lib/krb5/krb5_krbhst_init.3 Wed May 14 14:30:59 2003 +0000
@@ -1,6 +1,6 @@
.\" Copyright (c) 2001 Kungliga Tekniska Högskolan
.\" $Heimdal: krb5_krbhst_init.3,v 1.5 2002/08/28 15:30:54 joda Exp $
-.\" $NetBSD: krb5_krbhst_init.3,v 1.5 2003/01/02 13:00:16 wiz Exp $
+.\" $NetBSD: krb5_krbhst_init.3,v 1.6 2003/05/14 14:30:59 wiz Exp $
.Dd June 17, 2001
.Dt KRB5_KRBHST_INIT 3
.Os
@@ -77,7 +77,7 @@
.Pp
The related function,
.Fn krb5_krbhst_next_as_string ,
-return the same information as a url-like string.
+return the same information as a URL-like string.
.Pp
When there are no more hosts, these functions return
.Dv KRB5_KDC_UNREACH .
diff -r 1f58561c6f68 -r a2246b8ebf77 usr.bin/ftp/fetch.c
--- a/usr.bin/ftp/fetch.c Wed May 14 14:06:06 2003 +0000
+++ b/usr.bin/ftp/fetch.c Wed May 14 14:30:59 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.140 2003/03/07 08:13:48 grant Exp $ */
+/* $NetBSD: fetch.c,v 1.141 2003/05/14 14:31:00 wiz Exp $ */
/*-
* Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.140 2003/03/07 08:13:48 grant Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.141 2003/05/14 14:31:00 wiz Exp $");
#endif /* not lint */
/*
@@ -260,12 +260,12 @@
* XXX: this is not totally RFC 1738 compliant; <path> will have the
* leading `/' unless it's an ftp:// URL, as this makes things easier
* for file:// and http:// URLs. ftp:// URLs have the `/' between the
- * host and the url-path removed, but any additional leading slashes
- * in the url-path are retained (because they imply that we should
+ * host and the URL-path removed, but any additional leading slashes
+ * in the URL-path are retained (because they imply that we should
* later do "CWD" with a null argument).
*
* Examples:
- * input url output path
+ * input URL output path
* --------- -----------
* "ftp://host" NULL
* "http://host/" NULL
@@ -1767,7 +1767,7 @@
}
}
if (debug)
- fprintf(ttyout, "auto_put: url `%s' argv[2] `%s'\n",
+ fprintf(ttyout, "auto_put: URL `%s' argv[2] `%s'\n",
path, uargv[2] ? uargv[2] : "<null>");
/* connect and cwd */
diff -r 1f58561c6f68 -r a2246b8ebf77 usr.bin/ftp/ftp.1
--- a/usr.bin/ftp/ftp.1 Wed May 14 14:06:06 2003 +0000
+++ b/usr.bin/ftp/ftp.1 Wed May 14 14:30:59 2003 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: ftp.1,v 1.93 2003/02/28 09:54:51 lukem Exp $
+.\" $NetBSD: ftp.1,v 1.94 2003/05/14 14:31:00 wiz Exp $
.\"
.\" Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -162,7 +162,7 @@
.Op Ar \&.\&.\&.
.Nm
.Bk -words
-.Fl u Ar url Ar file
+.Fl u Ar URL Ar file
.Ek
.Op Ar \&.\&.\&.
.Sh DESCRIPTION
@@ -305,11 +305,11 @@
Refer to
.Ic rate
for more information.
-.It Fl u Ar url file Op \&.\&.\&.
+.It Fl u Ar URL file Op \&.\&.\&.
Upload files on the command line to
-.Ar url
+.Ar URL
where
-.Ar url
+.Ar URL
is one of the ftp URL types as supported by auto-fetch
(with an optional target filename for single file uploads), and
.Ar file
diff -r 1f58561c6f68 -r a2246b8ebf77 usr.bin/ftp/main.c
--- a/usr.bin/ftp/main.c Wed May 14 14:06:06 2003 +0000
+++ b/usr.bin/ftp/main.c Wed May 14 14:30:59 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.83 2002/08/27 13:11:02 christos Exp $ */
+/* $NetBSD: main.c,v 1.84 2003/05/14 14:31:00 wiz Exp $ */
/*-
* Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
@@ -108,7 +108,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: main.c,v 1.83 2002/08/27 13:11:02 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.84 2003/05/14 14:31:00 wiz Exp $");
#endif
#endif /* not lint */
@@ -1032,6 +1032,6 @@
" [-T dir,max[,inc][[user@]host [port]]] [host:path[/]]\n"
" [file:///file] [ftp://[user[:pass]@]host[:port]/path[/]]\n"
" [http://[user[:pass]@]host[:port]/path] [...]\n"
-" %s -u url file [...]\n", progname, progname);
+" %s -u URL file [...]\n", progname, progname);
exit(1);
}
diff -r 1f58561c6f68 -r a2246b8ebf77 usr.sbin/pkg_install/lib/file.c
--- a/usr.sbin/pkg_install/lib/file.c Wed May 14 14:06:06 2003 +0000
+++ b/usr.sbin/pkg_install/lib/file.c Wed May 14 14:30:59 2003 +0000
@@ -1,11 +1,11 @@
-/* $NetBSD: file.c,v 1.60 2003/04/10 16:25:25 grant Exp $ */
+/* $NetBSD: file.c,v 1.61 2003/05/14 14:31:01 wiz Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: file.c,v 1.29 1997/10/08 07:47:54 charnier Exp";
#else
-__RCSID("$NetBSD: file.c,v 1.60 2003/04/10 16:25:25 grant Exp $");
+__RCSID("$NetBSD: file.c,v 1.61 2003/05/14 14:31:01 wiz Exp $");
#endif
#endif
@@ -240,7 +240,7 @@
rp = NULL;
if (!IS_URL(spec)) {
- errx(EXIT_FAILURE, "fileGetURL was called with non-url arg '%s'", spec);
+ errx(EXIT_FAILURE, "fileGetURL was called with non-URL arg '%s'", spec);
}
/* Some sanity checks on the URL */
@@ -356,7 +356,7 @@
struct path *path;
/*
- * 1. if fname is an absolute pathname or a url,
+ * 1. if fname is an absolute pathname or a URL,
* just use it.
*/
if (IS_FULLPATH(fname) || IS_URL(fname))
diff -r 1f58561c6f68 -r a2246b8ebf77 usr.sbin/pkg_install/lib/ftpio.c
--- a/usr.sbin/pkg_install/lib/ftpio.c Wed May 14 14:06:06 2003 +0000
+++ b/usr.sbin/pkg_install/lib/ftpio.c Wed May 14 14:30:59 2003 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: ftpio.c,v 1.49 2003/01/05 21:27:28 agc Exp $ */
+/* $NetBSD: ftpio.c,v 1.50 2003/05/14 14:31:01 wiz Exp $ */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ftpio.c,v 1.49 2003/01/05 21:27:28 agc Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.50 2003/05/14 14:31:01 wiz Exp $");
#endif
/*
@@ -528,7 +528,7 @@
pkg=strrchr(wildcardurl, '/');
if (pkg == NULL){
- warnx("expandURL: no '/' in url %s?!", wildcardurl);
+ warnx("expandURL: no '/' in URL %s?!", wildcardurl);
return -1;
}
(void) snprintf(base, sizeof(base), "%*.*s/", (int)(pkg-wildcardurl),
@@ -660,7 +660,7 @@
char pkg_path[FILENAME_MAX];
{
- /* Verify if the url is really ok */
+ /* Verify if the URL is really ok */
char expnd[FILENAME_MAX];
rc=expandURL(expnd, url);
@@ -677,7 +677,7 @@
pkg=strrchr(url, '/');
if (pkg == NULL){
- warnx("unpackURL: no '/' in url %s?!", url);
+ warnx("unpackURL: no '/' in URL %s?!", url);
return -1;
}
(void) snprintf(base, sizeof(base), "%*.*s/", (int)(pkg-url),
@@ -733,7 +733,7 @@
pkg=strrchr(url, '/');
if (pkg == NULL){
- warnx("miscstuff: no '/' in url %s?!", url);
+ warnx("miscstuff: no '/' in URL %s?!", url);
return -1;
}
(void) snprintf(base, sizeof(base), "%*.*s/", (int)(pkg-url), (int)(pkg-url),
diff -r 1f58561c6f68 -r a2246b8ebf77 usr.sbin/sushi/functions.c
--- a/usr.sbin/sushi/functions.c Wed May 14 14:06:06 2003 +0000
+++ b/usr.sbin/sushi/functions.c Wed May 14 14:30:59 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: functions.c,v 1.5 2003/01/20 05:30:14 simonb Exp $ */
+/* $NetBSD: functions.c,v 1.6 2003/05/14 14:31:01 wiz Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -151,7 +151,7 @@
}
/*
- * Return list of packages available at the given url
+ * Return list of packages available at the given URL
* or NULL on error. Returned pointer can be free(3)d
* later.
*/
@@ -237,7 +237,7 @@
}
/*
- * Return list of package categories available at the given url
+ * Return list of package categories available at the given URL
* or NULL on error. Returned pointer can be free(3)d
* later.
*/
Home |
Main Index |
Thread Index |
Old Index