Changeset a569125 in freewrt for tools/paxmirabilis/src/extern.h

Timestamp:

Feb 16, 2012, 10:14:16 PM (14 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

7417b08

Parents:

3784d08

Message:

even FreeWRT 1.0-stable deserves paxmirabilis-20120216 compiled with LTO ☺

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@3981 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• tools/paxmirabilis/src/extern.h (modified) (12 diffs)

tools/paxmirabilis/src/extern.h

@@ -1 @@
-/**     $MirOS: src/bin/pax/extern.h,v 1.12 2009/10/04 14:51:06 tg Exp $ */
-/*      $OpenBSD: extern.h,v 1.32 2006/11/17 08:38:04 otto Exp $        */
+/**     $MirOS: src/bin/pax/extern.h,v 1.19 2012/02/16 17:27:31 tg Exp $ */
+/*      $OpenBSD: extern.h,v 1.34 2010/12/02 04:08:27 tedu Exp $        */
 /*      $NetBSD: extern.h,v 1.5 1996/03/26 23:54:16 mrg Exp $   */
 
@@ -47 +47 @@
 #endif
 
-#if !defined(__INTERIX) && !defined(__APPLE__)
-#define HAS_TAPE        1
-#else
-#define HAS_TAPE        0
-#endif
-
+/*
+ * ar.c
+ */
+int uar_stwr(int);
+int uar_ismagic(char *);
+int uar_id(char *, int) __attribute__((__noreturn__));
+int uar_rd(ARCHD *, char *);
+int uar_wr(ARCHD *);
+int uar_wr_data(ARCHD *, int, off_t *);
+off_t uar_endrd(void);
+int uar_trail(ARCHD *, char *, int, int *) __attribute__((__noreturn__));
 
 /*
@@ -58 +63 @@
  */
 extern const char *arcname;
-extern const char *gzip_program;
+extern const char *compress_program;
 extern int force_one_volume;
 int ar_open(const char *);
@@ -71 +76 @@
 int ar_rev(off_t );
 int ar_next(void);
+extern int ar_do_keepopen;
+int ar_next_keepopen(void);
 
 /*
@@ -107 +114 @@
 void cp_file(ARCHD *, int, int);
 int buf_fill(void);
+int buf_fill_internal(int);
 int buf_flush(int);
 
@@ -130 +138 @@
 int cpio_rd(ARCHD *, char *);
 off_t cpio_endrd(void);
-int cpio_stwr(void);
-int dist_stwr(void);
+int cpio_stwr(int);
+int dist_stwr(int);
 int cpio_wr(ARCHD *);
 int vcpio_id(char *, int);
@@ -138 +146 @@
 int vcpio_rd(ARCHD *, char *);
 off_t vcpio_endrd(void);
-int crc_stwr(void);
-int v4root_stwr(void);
-int v4norm_stwr(void);
+int crc_stwr(int);
+int v4root_stwr(int);
+int v4norm_stwr(int);
 int vcpio_wr(ARCHD *);
 int bcpio_id(char *, int);
@@ -176 +184 @@
 int ftree_add(char *, int);
 void ftree_sel(ARCHD *);
+void ftree_skipped_newer(void);
 void ftree_chk(void);
 int next_file(ARCHD *);
@@ -187 +196 @@
 u_long asc_ul(char *, int, int);
 int ul_asc(u_long, char *, int, int);
-#ifndef LONG_OFF_T
-u_quad_t asc_uqd(char *, int, int);
-int uqd_asc(u_quad_t, char *, int, int);
-#endif
+ot_type asc_ot(char *, int, int);
+int ot_asc(ot_type, char *, int, int);
 size_t fieldcpy(char *, size_t, const char *, size_t);
 
@@ -234 +241 @@
 extern int tflag;
 extern int uflag;
+extern int Vflag;
 extern int vflag;
 extern int Dflag;
@@ -307 +315 @@
 int tar_wr(ARCHD *);
 int ustar_strd(void);
-int ustar_stwr(void);
+int ustar_stwr(int);
 int ustar_id(char *, int);
 int ustar_rd(ARCHD *, char *);
@@ -317 +325 @@
 int tty_init(void);
 void tty_prnt(const char *, ...)
-    __attribute__((format (printf, 1, 2)));
+    __attribute__((__format__ (__printf__, 1, 2)));
 int tty_read(char *, int);
 void paxwarn(int, const char *, ...)
-    __attribute__((format (printf, 2, 3)));
+    __attribute__((__format__ (__printf__, 2, 3)));
 void syswarn(int, int, const char *, ...)
-    __attribute__((format (printf, 3, 4)));
+    __attribute__((__format__ (__printf__, 3, 4)));
+
+/*
+ * part of the OS
+ */
+#ifdef USE_LIBBSD
+size_t strlcat(char *, const char *, size_t);
+size_t strlcpy(char *, const char *, size_t);
+#endif