*** empty log message ***

diff --git a/src/tar.h b/src/tar.h
index 33d7c2dbb3e8c4d1d30b4b0cf460b38cd0916759..718a86ef908dfaf8dc5e106b58afedce9d02c2fa 100644 (file)
--- a/src/tar.h
+++ b/src/tar.h
@@ -101,7 +101,7 @@ union record {
 #define        CHKBLANKS       "        "      /* 8 blanks, no null */
 
 /* The magic field is filled with this if uname and gname are valid. */
-#define        TMAGIC          "ustar"         /* 5 chars and a null */
+#define        TMAGIC          "ustar  "       /* 7 chars and a null */
 
 /* The linkflag defines the type of file */
 #define        LF_OLDNORMAL    '\0'            /* Normal disk file, Unix compat */
@@ -122,6 +122,8 @@ union record {
                                           the names of files that were in
                                           the dir at the time the dump
                                           was made */
+#define LF_LONGNAME    'L'             /* Identifies the NEXT file on the tape
+                                          as having a long name. */
 #define LF_MULTIVOL    'M'             /* This is the continuation
                                           of a file that began on another
                                           volume */
@@ -152,7 +154,6 @@ TAR_EXTERN union record     *ar_last;       /* Last+1 record of archive block */
 TAR_EXTERN char                ar_reading;     /* 0 writing, !0 reading archive */
 TAR_EXTERN int         blocking;       /* Size of each block, in records */
 TAR_EXTERN int         blocksize;      /* Size of each block, in bytes */
-TAR_EXTERN char                *ar_file;       /* File containing archive */
 TAR_EXTERN char                *info_script;   /* Script to run at end of each tape change */
 TAR_EXTERN char                *name_file;     /* File containing names to work on */
 TAR_EXTERN char                filename_terminator; /* \n or \0. */
@@ -162,6 +163,10 @@ TAR_EXTERN int             sp_array_size;  /* Initial size of the sparsearray */
 TAR_EXTERN int                 tot_written;    /* Total written to output */
 TAR_EXTERN struct re_pattern_buffer
                        *label_pattern; /* compiled regex for extract label */
+TAR_EXTERN char        **ar_files;     /* list of tape drive names */
+TAR_EXTERN int         n_ar_files;     /* number of tape drive names */
+TAR_EXTERN int         cur_ar_file;    /* tape drive currently being used */
+TAR_EXTERN int         ar_files_len;   /* malloced size of ar_files */
 
 /*
  * Flags from the command line
@@ -225,6 +230,8 @@ TAR_EXTERN int      f_ignore_failed_read;   /* --ignore-failed-read */
 TAR_EXTERN int f_checkpoint;           /* --checkpoint */
 TAR_EXTERN int f_show_omitted_dirs;    /* --show-omitted-dirs */
 TAR_EXTERN char *f_volno_file;         /* --volno-file */
+TAR_EXTERN int f_force_local;          /* --force-local */
+TAR_EXTERN int f_atime_preserve;       /* --atime-preserve */
 
 /*
  * We default to Unix Standard format rather than 4.2BSD tar format.

diff --git a/src/testpad.c b/src/testpad.c
index f622dc99418c7ea56c5d9798ab85b4cf61e6a8b5..12d96e348a29358e4d90570e6262887efa82fdf7 100644 (file)
--- a/src/testpad.c
+++ b/src/testpad.c
@@ -43,18 +43,19 @@ main ()
   struct test1 t1;
   struct test2 t2;
   int t1diff, t2diff;
-  FILE *fp = fopen("testpad.h", "w");
+  FILE *fp = fopen ("testpad.h", "w");
 
   if (fp == 0)
     {
       fprintf (stderr, "testpad: cannot open ");
+      fflush (stderr);
       perror ("testpad.h");
       exit (1);
     }
 
-  t1diff = (char *)&t1.in[0] - (char *)&t1;
-  t2diff = (char *)&t2.in[0] - (char *)&t2;
-  
+  t1diff = (char *) &t1.in[0] - (char *) &t1;
+  t2diff = (char *) &t2.in[0] - (char *) &t2;
+
   if (t2diff == t1diff + 1)
     fprintf (fp, "#define NEEDPAD\n");
   else if (t1diff != t2diff)