[src/trunk]: src/usr.sbin/pkg_install/lib ftp(1)'s "ls" now lists files/dirs ...

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

details:   https://anonhg.NetBSD.org/src/rev/e549516f9233
branches:  trunk
changeset: 487449:e549516f9233
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Thu Jun 08 00:26:48 2000 +0000

description:
ftp(1)'s "ls" now lists files/dirs plus attributes (much like "dir" did
before). Use "nlist" to still get filenames only.
Needed to expand wildcards.

diffstat:

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

diffs (61 lines):

diff -r 133d2385e76f -r e549516f9233 usr.sbin/pkg_install/lib/ftpio.c
--- a/usr.sbin/pkg_install/lib/ftpio.c  Wed Jun 07 23:54:17 2000 +0000
+++ b/usr.sbin/pkg_install/lib/ftpio.c  Thu Jun 08 00:26:48 2000 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: ftpio.c,v 1.18 2000/02/27 02:35:28 hubertf Exp $       */
+/*     $NetBSD: ftpio.c,v 1.19 2000/06/08 00:26:48 hubertf Exp $       */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ftpio.c,v 1.18 2000/02/27 02:35:28 hubertf Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.19 2000/06/08 00:26:48 hubertf Exp $");
 #endif
 
 /*
@@ -465,7 +465,7 @@
        strcpy(tmpname, "/tmp/pkg.XXXXXX");
        tfd=mkstemp(tmpname);
        if (tfd == -1) {
-               warnx("Cannot generate temp file for ftp(1)'s ls output");
+               warnx("Cannot generate temp file for ftp(1)'s nlist output");
                return -1; /* error */
        }
        close(tfd); /* We don't need the file descriptor, but will use 
@@ -477,20 +477,20 @@
                /* This should only happen when getting here with (only) a package
                 * name specified to pkg_add, and PKG_PATH containing some URL.
                 */
-               (void) snprintf(buf, sizeof(buf), "ls %s %s\n", pkg, tmpname);
+               (void) snprintf(buf, sizeof(buf), "nlist %s %s\n", pkg, tmpname);
        } else {
                /* replace possible version(wildcard) given with "-*".
                 * we can't use the pkg wildcards here as dewey compare
                 * and alternates won't be handled by ftp(1); sort
                 * out later, using pmatch() */
-               (void) snprintf(buf,  sizeof(buf), "ls %*.*s*.tgz %s\n",
+               (void) snprintf(buf,  sizeof(buf), "nlist %*.*s*.tgz %s\n",
                          (int)(s-pkg), (int)(s-pkg), pkg, tmpname);
        }
        
        rc = ftp_cmd(buf, "\n(550|226).*\n"); /* catch errors */
        if (rc != 226) {
            if (Verbose)
-                   warnx("ls failed!");
+                   warnx("nlist failed!");
            unlink(tmpname);    /* remove clutter */
            return -1;
        }
@@ -674,11 +674,11 @@
     /* check if one more file(s) exist */
     if (0) {
        char buf[FILENAME_MAX];
-       (void) snprintf(buf, sizeof(buf), "ls %s /tmp/xxx\n", pkg);
+       (void) snprintf(buf, sizeof(buf), "nlist %s /tmp/xxx\n", pkg);
        rc = ftp_cmd(buf, "\n(226|550).*\n"); /* catch errors */
        if (rc != 226) {
            if (Verbose)
-               warnx("ls failed!");
+               warnx("nlist failed!");
            return -1;
        }