prettyness police

[unix-history] / usr / src / usr.bin / ar / archive.h

diff --git a/usr/src/usr.bin/ar/archive.h b/usr/src/usr.bin/ar/archive.h
index d413432..3be661b 100644 (file)
--- a/usr/src/usr.bin/ar/archive.h
+++ b/usr/src/usr.bin/ar/archive.h
@@ -1,11 +1,13 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * 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.
  *

- *     @(#)archive.h   5.6 (Berkeley) %G%
+ * %sccs.include.redist.c%
+ *
+ *     @(#)archive.h   8.2 (Berkeley) %G%

  */
 
 /* Ar(1) options. */
  */
 
 /* Ar(1) options. */


@@ -18,8 +20,8 @@
 #define        AR_P    0x0040
 #define        AR_Q    0x0080
 #define        AR_R    0x0100
 #define        AR_P    0x0040
 #define        AR_Q    0x0080
 #define        AR_R    0x0100

-#define        AR_S    0x0200
-#define        AR_T    0x0400
+#define        AR_T    0x0200
+#define        AR_TR   0x0400

 #define        AR_U    0x0800
 #define        AR_V    0x1000
 #define        AR_X    0x2000
 #define        AR_U    0x0800
 #define        AR_V    0x1000
 #define        AR_X    0x2000


@@ -58,22 +60,20 @@ typedef struct {
 } CHDR;
 
 /* Header format strings. */
 } CHDR;
 
 /* Header format strings. */

-#define        HDR1    "%s%-13d%-12ld%-6u%-6u%-8o%-10ld%2s"
-#define        HDR2    "%-16.16s%-12ld%-6u%-6u%-8o%-10ld%2s"
+#define        HDR1    "%s%-13d%-12ld%-6u%-6u%-8o%-10qd%2s"
+#define        HDR2    "%-16.16s%-12ld%-6u%-6u%-8o%-10qd%2s"

 
 #define        OLDARMAXNAME    15
 
 #define        OLDARMAXNAME    15

-#define        HDR3    "%-16.15s%-12ld%-6u%-6u%-8o%-10ld%2s"
+#define        HDR3    "%-16.15s%-12ld%-6u%-6u%-8o%-10qd%2s"

 
 
 #include <sys/cdefs.h>
 
 
 
 #include <sys/cdefs.h>
 

-__BEGIN_DECLS
+struct stat;
+

 void   close_archive __P((int));
 void   close_archive __P((int));

-void   skip_arobj __P((int));
-int    copy_ar __P((CF *, off_t));
+void   copy_ar __P((CF *, off_t));

 int    get_arobj __P((int));
 int    open_archive __P((int));
 int    get_arobj __P((int));
 int    open_archive __P((int));

-struct stat;
-int    put_arobj __P((CF *, struct stat *));
-__END_DECLS
-
+void   put_arobj __P((CF *, struct stat *));
+void   skip_arobj __P((int));