[src/netbsd-1-6]: src/usr.sbin/pkg_install/lib Pullup rev 1.48-1.49 (requeste...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d1584987cccc
branches:  netbsd-1-6
changeset: 530086:d1584987cccc
user:      jmc <jmc%NetBSD.org@localhost>
date:      Sat Feb 08 07:52:23 2003 +0000

description:
Pullup rev 1.48-1.49 (requested by abs in ticket #1141)
 Catchup to -current as of version 20030202.

diffstat:

 usr.sbin/pkg_install/lib/ftpio.c |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (85 lines):

diff -r 45f4199d0bdd -r d1584987cccc usr.sbin/pkg_install/lib/ftpio.c
--- a/usr.sbin/pkg_install/lib/ftpio.c  Sat Feb 08 07:52:05 2003 +0000
+++ b/usr.sbin/pkg_install/lib/ftpio.c  Sat Feb 08 07:52:23 2003 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: ftpio.c,v 1.35.2.10 2002/11/24 22:36:03 tron Exp $     */
+/*     $NetBSD: ftpio.c,v 1.35.2.11 2003/02/08 07:52:23 jmc Exp $      */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ftpio.c,v 1.35.2.10 2002/11/24 22:36:03 tron Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.35.2.11 2003/02/08 07:52:23 jmc Exp $");
 #endif
 
 /*
@@ -113,12 +113,12 @@
 #if EXPECT_DEBUG
     vstr=malloc(2*sizeof(buf));
     if (vstr == NULL)
-       err(1, "expect: malloc() failed");
+       err(EXIT_FAILURE, "expect: malloc() failed");
     strvis(vstr, str, VIS_NL|VIS_SAFE|VIS_CSTYLE);
 #endif /* EXPECT_DEBUG */
            
     if (regcomp(&rstr, str, REG_EXTENDED) != 0)
-       err(1, "expect: regcomp() failed");
+       err(EXIT_FAILURE, "expect: regcomp() failed");
 
 #if EXPECT_DEBUG
     if (expect_debug)
@@ -294,14 +294,14 @@
            (void) close(command_pipe[1]);
            rc1 = dup2(command_pipe[0], 0);
             if (rc1 == -1) {
-                    err(1, "setupCoproc: dup2 failed (command_pipe[0])");
+                    err(EXIT_FAILURE, "setupCoproc: dup2 failed (command_pipe[0])");
             }
            (void) close(command_pipe[0]);
            
            (void) close(answer_pipe[0]);
            rc1 = dup2(answer_pipe[1], 1);
             if (rc1 == -1) {
-                    err(1, "setupCoproc: dup2 failed (answer_pipe[1])");
+                    err(EXIT_FAILURE, "setupCoproc: dup2 failed (answer_pipe[1])");
             }
            (void) close(answer_pipe[1]);
            
@@ -431,7 +431,7 @@
        fileURLHost(base, newHost, sizeof(newHost));
        urllen = URLlength(base);
        if (urllen < 0 || !(newDir = strchr(base + URLlength(base), '/')))
-               errx(1, "ftp_start: bad URL '%s'", base);
+               errx(EXIT_FAILURE, "ftp_start: bad URL '%s'", base);
        newDir++;
        if (currentHost
            && currentDir
@@ -661,16 +661,16 @@
 
        {
                /* Verify if the url is really ok */
-               char exp[FILENAME_MAX];
+               char expnd[FILENAME_MAX];
 
-               rc=expandURL(exp, url);
+               rc=expandURL(expnd, url);
                if (rc == -1) {
                        warnx("unpackURL: verification expandURL failed");
                        return -1;
                }
-               if (strcmp(exp, url) != 0) {
+               if (strcmp(expnd, url) != 0) {
                        warnx("unpackURL: verification expandURL failed, '%s'!='%s'",
-                             exp, url);
+                             expnd, url);
                        return -1;
                }
        }
@@ -846,7 +846,7 @@
 static void
 usage(void)
 {
-  errx(1, "Usage: foo [-v] ftp://-pattern";);
+  errx(EXIT_FAILURE, "Usage: foo [-v] ftp://-pattern";);
 }