BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / ar / contents.c

diff --git a/usr/src/usr.bin/ar/contents.c b/usr/src/usr.bin/ar/contents.c
index 8103f38..995a800 100644 (file)
--- a/usr/src/usr.bin/ar/contents.c
+++ b/usr/src/usr.bin/ar/contents.c
@@ -5,11 +5,37 @@
  * This code is derived from software contributed to Berkeley by
  * Hugh Smith at The University of Guelph.
  *
  * This code is derived from software contributed to Berkeley by
  * Hugh Smith at The University of Guelph.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)contents.c 5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)contents.c 5.6 (Berkeley) 3/12/91";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -19,9 +45,11 @@ static char sccsid[] = "@(#)contents.c       5.2 (Berkeley) %G%";
 #include <unistd.h>
 #include <tzfile.h>
 #include <dirent.h>
 #include <unistd.h>
 #include <tzfile.h>
 #include <dirent.h>

-#include <stdio.h>

 #include <ar.h>
 #include <ar.h>

+#include <stdio.h>
+#include <string.h>

 #include "archive.h"
 #include "archive.h"

+#include "extern.h"

 
 extern CHDR chdr;                      /* converted header */
 extern char *archive;                  /* archive name */
 
 extern CHDR chdr;                      /* converted header */
 extern char *archive;                  /* archive name */


@@ -35,31 +63,34 @@ contents(argv)
        register char **argv;
 {
        register int afd, all;
        register char **argv;
 {
        register int afd, all;

-       int eval;

        struct tm *tp;
        struct tm *tp;

-       char buf[25];
+       char *file, buf[25];

        
        afd = open_archive(O_RDONLY);
 
        
        afd = open_archive(O_RDONLY);
 

-       for (all = !*argv; get_header(afd);) {
-               if (all || files(argv)) {
-                       if (options & AR_V) {
-                               (void)strmode(chdr.mode, buf);
-                               (void)printf("%s %6d/%-6d %8ld ",
-                                   buf + 1, chdr.uid, chdr.gid, chdr.size);
-                               tp = localtime(&chdr.date);
-                               (void)strftime(buf, sizeof(buf),
-                                   "%b %e %H:%M %Y", tp);
-                               (void)printf("%s %s\n", buf, chdr.name);
-                       } else
-                               (void)printf("%s\n", chdr.name);
-                       if (!all && !*argv)
-                               break;
-               }
-               SKIP(afd, chdr.size, archive);
+       for (all = !*argv; get_arobj(afd);) {
+               if (all)
+                       file = chdr.name;
+               else if (!(file = files(argv)))
+                       goto next;
+               if (options & AR_V) {
+                       (void)strmode(chdr.mode, buf);
+                       (void)printf("%s %6d/%-6d %8ld ",
+                           buf + 1, chdr.uid, chdr.gid, chdr.size);
+                       tp = localtime(&chdr.date);
+                       (void)strftime(buf, sizeof(buf), "%b %e %H:%M %Y", tp);
+                       (void)printf("%s %s\n", buf, file);
+               } else
+                       (void)printf("%s\n", file);
+               if (!all && !*argv)
+                       break;
+next:          skip_arobj(afd);

        } 
        } 

-       eval = 0;
-       ORPHANS;

        close_archive(afd);
        close_archive(afd);

-       return(eval);
+
+       if (*argv) {
+               orphans(argv);
+               return(1);
+       }
+       return(0);

 }
 }