*** empty log message ***

[chaz/tar] / src / tar.h

diff --git a/src/tar.h b/src/tar.h
index 64a6fdd53c8344d005d630906df60ffb123ad0d5..33d7c2dbb3e8c4d1d30b4b0cf460b38cd0916759 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  "       /* 7 chars and a null */
+#define        TMAGIC          "ustar"         /* 5 chars and a null */
 
 /* The linkflag defines the type of file */
 #define        LF_OLDNORMAL    '\0'            /* Normal disk file, Unix compat */
@@ -176,7 +176,7 @@ TAR_EXTERN int cmd_mode;
 #define CMD_UPDATE     6               /* -u */
 #define CMD_EXTRACT    7               /* -x */
 #define CMD_DELETE     8               /* -D */
-#define CMD_VERSION    9               /* +version */
+#define CMD_VERSION    9               /* --version */
 
                                        /* -[0-9][lmh] */
                        /* CMD_CAT         -A */
@@ -218,13 +218,13 @@ TAR_EXTERN int  f_verify;         /* -W */
 TAR_EXTERN int  f_exclude;             /* -X */
 TAR_EXTERN int         f_compress;             /* -z */
                                        /* -Z */
-TAR_EXTERN int f_do_chown;             /* +do-chown */
-TAR_EXTERN int  f_totals;              /* +totals */
-TAR_EXTERN int f_remove_files;         /* +remove-files */
-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_do_chown;             /* --do-chown */
+TAR_EXTERN int  f_totals;              /* --totals */
+TAR_EXTERN int f_remove_files;         /* --remove-files */
+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 */
 
 /*
  * We default to Unix Standard format rather than 4.2BSD tar format.
@@ -275,7 +275,7 @@ void userec();
 union record *endofrecs();
 void anno();
 
-#if !defined (VPRINTF_MISSING) && defined (__STDC__)
+#if defined (HAVE_VPRINTF) && __STDC__
 void msg(char *, ...);
 void msg_perror(char *, ...);
 #else