BSD 4_3_Net_2 release

[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 6e11a3d..c8f3322 100644 (file)
--- a/usr/src/usr.bin/ar/archive.h
+++ b/usr/src/usr.bin/ar/archive.h
@@ -1,11 +1,39 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1991 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.
  *
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Hugh Smith at The University of Guelph.
  *

- *     @(#)archive.h   5.5 (Berkeley) %G%
+ * 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.
+ *
+ *     @(#)archive.h   5.8 (Berkeley) 4/12/91

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


@@ -18,8 +46,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


@@ -69,11 +97,11 @@ typedef struct {
 
 __BEGIN_DECLS
 void   close_archive __P((int));
 
 __BEGIN_DECLS
 void   close_archive __P((int));

-void   skipobj __P((int));
-int    copyfile __P((CF *, off_t));
-int    get_header __P((int));
+void   skip_arobj __P((int));
+int    copy_ar __P((CF *, off_t));
+int    get_arobj __P((int));

 int    open_archive __P((int));
 struct stat;
 int    open_archive __P((int));
 struct stat;

-int    put_object __P((CF *, struct stat *));
+int    put_arobj __P((CF *, struct stat *));

 __END_DECLS
 
 __END_DECLS