svn commit: r311863 - stable/10/lib/libfetch

[Dag-Erling Smørgrav]

Author: des
Date: Tue Jan 10 08:08:49 2017
New Revision: 311863
URL: https://svnweb.freebsd.org/changeset/base/311863

Log:
  MFH (r267371, r297754, r299520): nits and style

Modified:
  stable/10/lib/libfetch/fetch.3
  stable/10/lib/libfetch/ftp.c
  stable/10/lib/libfetch/http.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libfetch/fetch.3
==============================================================================
--- stable/10/lib/libfetch/fetch.3	Tue Jan 10 07:50:21 2017	(r311862)
+++ stable/10/lib/libfetch/fetch.3	Tue Jan 10 08:08:49 2017	(r311863)
@@ -783,27 +783,27 @@ library first appeared in
 The
 .Nm fetch
 library was mostly written by
-.An Dag-Erling Sm\(/orgrav Aq des at FreeBSD.org
+.An Dag-Erling Sm\(/orgrav Aq Mt des at FreeBSD.org
 with numerous suggestions and contributions from
-.An Jordan K. Hubbard Aq jkh at FreeBSD.org ,
-.An Eugene Skepner Aq eu at qub.com ,
-.An Hajimu Umemoto Aq ume at FreeBSD.org ,
-.An Henry Whincup Aq henry at techiebod.com ,
-.An Jukka A. Ukkonen Aq jau at iki.fi ,
-.An Jean-Fran\(,cois Dockes Aq jf at dockes.org ,
-.An Michael Gmelin Aq freebsd at grem.de
+.An Jordan K. Hubbard Aq Mt jkh at FreeBSD.org ,
+.An Eugene Skepner Aq Mt eu at qub.com ,
+.An Hajimu Umemoto Aq Mt ume at FreeBSD.org ,
+.An Henry Whincup Aq Mt henry at techiebod.com ,
+.An Jukka A. Ukkonen Aq Mt jau at iki.fi ,
+.An Jean-Fran\(,cois Dockes Aq Mt jf at dockes.org ,
+.An Michael Gmelin Aq Mt freebsd at grem.de
 and others.
 It replaces the older
 .Nm ftpio
 library written by
-.An Poul-Henning Kamp Aq phk at FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk at FreeBSD.org
 and
-.An Jordan K. Hubbard Aq jkh at FreeBSD.org .
+.An Jordan K. Hubbard Aq Mt jkh at FreeBSD.org .
 .Pp
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des at FreeBSD.org
+.An Dag-Erling Sm\(/orgrav Aq Mt des at FreeBSD.org
 and
-.An Michael Gmelin Aq freebsd at grem.de .
+.An Michael Gmelin Aq Mt freebsd at grem.de .
 .Sh BUGS
 Some parts of the library are not yet implemented.
 The most notable

Modified: stable/10/lib/libfetch/ftp.c
==============================================================================
--- stable/10/lib/libfetch/ftp.c	Tue Jan 10 07:50:21 2017	(r311862)
+++ stable/10/lib/libfetch/ftp.c	Tue Jan 10 08:08:49 2017	(r311863)
@@ -929,7 +929,7 @@ ftp_authenticate(conn_t *conn, struct ur
 		if (*pwd == '\0')
 			pwd = getenv("FTP_PASSWORD");
 		if (pwd == NULL || *pwd == '\0') {
-			if ((logname = getlogin()) == 0)
+			if ((logname = getlogin()) == NULL)
 				logname = FTP_ANONYMOUS_USER;
 			if ((len = snprintf(pbuf, MAXLOGNAME + 1, "%s@", logname)) < 0)
 				len = 0;

Modified: stable/10/lib/libfetch/http.c
==============================================================================
--- stable/10/lib/libfetch/http.c	Tue Jan 10 07:50:21 2017	(r311862)
+++ stable/10/lib/libfetch/http.c	Tue Jan 10 08:08:49 2017	(r311863)
@@ -875,7 +875,7 @@ http_parse_mtime(const char *p, time_t *
 	char locale[64], *r;
 	struct tm tm;
 
-	strncpy(locale, setlocale(LC_TIME, NULL), sizeof(locale));
+	strlcpy(locale, setlocale(LC_TIME, NULL), sizeof(locale));
 	setlocale(LC_TIME, "C");
 	r = strptime(p, "%a, %d %b %Y %H:%M:%S GMT", &tm);
 	/*