[Midnightbsd-cvs] src: usr.bin/fetch: Sync with FreeBSD CURRENT.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Sync with FreeBSD CURRENT.

$MidnightBSD$

Modified Files:
--------------
    src/usr.bin/fetch:
        Makefile (r1.1.1.1 -> r1.2)
        fetch.1 (r1.1.1.1 -> r1.2)
        fetch.c (r1.1.1.2 -> r1.2)

-------------- next part --------------
Index: fetch.1
===================================================================
RCS file: /home/cvs/src/usr.bin/fetch/fetch.1,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.bin/fetch/fetch.1 -L usr.bin/fetch/fetch.1 -u -r1.1.1.1 -r1.2
--- usr.bin/fetch/fetch.1
+++ usr.bin/fetch/fetch.1
@@ -27,7 +27,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.bin/fetch/fetch.1,v 1.66 2005/02/13 22:25:21 ru Exp $
+.\" $MidnightBSD$
+.\" $FreeBSD: src/usr.bin/fetch/fetch.1,v 1.68 2007/12/28 19:47:37 des Exp $
 .\"
 .Dd March 11, 2003
 .Dt FETCH 1
@@ -212,27 +213,37 @@
 .Sh ENVIRONMENT
 .Bl -tag -width HTTP_TIMEOUT
 .It Ev FTP_TIMEOUT
-maximum time, in seconds, to wait before aborting an FTP connection.
+Maximum time, in seconds, to wait before aborting an FTP connection.
 .It Ev HTTP_TIMEOUT
-maximum time, in seconds, to wait before aborting an HTTP connection.
+Maximum time, in seconds, to wait before aborting an HTTP connection.
 .El
 .Pp
-All environment variables mentioned in the documentation for the
-.Xr fetch 3
-library are supported.
-A number of these are quite important to the proper operation of
-.Nm ;
-you are strongly encouraged to read
+See
 .Xr fetch 3
-as well.
+for a description of additional environment variables, including
+.Ev FETCH_BIND_ADDRESS ,
+.Ev FTP_LOGIN ,
+.Ev FTP_PASSIVE_MODE ,
+.Ev FTP_PASSWORD ,
+.Ev FTP_PROXY ,
+.Ev ftp_proxy ,
+.Ev HTTP_AUTH ,
+.Ev HTTP_PROXY ,
+.Ev http_proxy ,
+.Ev HTTP_PROXY_AUTH ,
+.Ev HTTP_REFERER ,
+.Ev HTTP_USER_AGENT ,
+.Ev NETRC ,
+.Ev NO_PROXY and
+.Ev no_proxy .
 .Sh EXIT STATUS
 The
 .Nm
 command returns zero on success, or one on failure.
 If multiple URLs are listed on the command line,
 .Nm
-will attempt to retrieve them each of them in turn, and return zero
-only if they were all successfully retrieved.
+will attempt to retrieve each one of them in turn, and will return
+zero only if they were all successfully retrieved.
 .Sh SEE ALSO
 .Xr fetch 3
 .Sh HISTORY
Index: fetch.c
===================================================================
RCS file: /home/cvs/src/usr.bin/fetch/fetch.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L usr.bin/fetch/fetch.c -L usr.bin/fetch/fetch.c -u -r1.1.1.2 -r1.2
--- usr.bin/fetch/fetch.c
+++ usr.bin/fetch/fetch.c
@@ -24,10 +24,12 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD: src/usr.bin/fetch/fetch.c,v 1.78 2006/11/10 22:05:41 des Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/fetch/fetch.c,v 1.75.2.1 2006/01/13 09:07:49 des Exp $");
+__MBSDID("$MidnightBSD$");
 
 #include <sys/param.h>
 #include <sys/socket.h>
@@ -569,6 +571,8 @@
 			if (tmppath != NULL) {
 				mkstemps(tmppath, strlen(slash) + 1);
 				of = fopen(tmppath, "w");
+				chown(tmppath, sb.st_uid, sb.st_gid);
+				chmod(tmppath, sb.st_mode & ALLPERMS);
 			}
 		}
 		if (of == NULL)
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/fetch/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.bin/fetch/Makefile -L usr.bin/fetch/Makefile -u -r1.1.1.1 -r1.2
--- usr.bin/fetch/Makefile
+++ usr.bin/fetch/Makefile
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD: src/usr.bin/fetch/Makefile,v 1.17 2004/12/21 10:16:02 ru Exp $
 
 PROG=		fetch