/[tar]/tar/src/tar.c
ViewVC logotype

Diff of /tar/src/tar.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.58 by gray, Sun Jul 27 12:01:59 2003 UTC revision 1.59 by gray, Mon Jul 28 11:40:35 2003 UTC
# Line 159  enum Line 159  enum
159    VOLNO_FILE_OPTION,    VOLNO_FILE_OPTION,
160    WILDCARDS_OPTION,    WILDCARDS_OPTION,
161    WILDCARDS_MATCH_SLASH_OPTION,    WILDCARDS_MATCH_SLASH_OPTION,
   
   /* Some cleanup is being made in GNU tar long options.  Using old names is  
      allowed for a while, but will also send a warning to stderr.  Take old  
      names out in 1.14, or in summer 1997, whichever happens last.  */  
   
   OBSOLETE_ABSOLUTE_NAMES,  
   OBSOLETE_BLOCK_COMPRESS,  
   OBSOLETE_BLOCKING_FACTOR,  
   OBSOLETE_BLOCK_NUMBER,  
   OBSOLETE_READ_FULL_RECORDS,  
   OBSOLETE_TOUCH,  
   OBSOLETE_VERSION_CONTROL  
162  };  };
163    
164  /* If nonzero, display usage information and exit.  */  /* If nonzero, display usage information and exit.  */
# Line 182  static int show_version; Line 170  static int show_version;
170  static struct option long_options[] =  static struct option long_options[] =
171  {  {
172    {"absolute-names", no_argument, 0, 'P'},    {"absolute-names", no_argument, 0, 'P'},
   {"absolute-paths", no_argument, 0, OBSOLETE_ABSOLUTE_NAMES},  
173    {"after-date", required_argument, 0, 'N'},    {"after-date", required_argument, 0, 'N'},
174    {"anchored", no_argument, 0, ANCHORED_OPTION},    {"anchored", no_argument, 0, ANCHORED_OPTION},
175    {"append", no_argument, 0, 'r'},    {"append", no_argument, 0, 'r'},
176    {"atime-preserve", no_argument, 0, ATIME_PRESERVE_OPTION},    {"atime-preserve", no_argument, 0, ATIME_PRESERVE_OPTION},
177    {"backup", optional_argument, 0, BACKUP_OPTION},    {"backup", optional_argument, 0, BACKUP_OPTION},
   {"block-compress", no_argument, 0, OBSOLETE_BLOCK_COMPRESS},  
178    {"block-number", no_argument, 0, 'R'},    {"block-number", no_argument, 0, 'R'},
   {"block-size", required_argument, 0, OBSOLETE_BLOCKING_FACTOR},  
179    {"blocking-factor", required_argument, 0, 'b'},    {"blocking-factor", required_argument, 0, 'b'},
180    {"bzip2", no_argument, 0, 'j'},    {"bzip2", no_argument, 0, 'j'},
181    {"catenate", no_argument, 0, 'A'},    {"catenate", no_argument, 0, 'A'},
# Line 230  static struct option long_options[] = Line 215  static struct option long_options[] =
215    {"list", no_argument, 0, 't'},    {"list", no_argument, 0, 't'},
216    {"listed-incremental", required_argument, 0, 'g'},    {"listed-incremental", required_argument, 0, 'g'},
217    {"mode", required_argument, 0, MODE_OPTION},    {"mode", required_argument, 0, MODE_OPTION},
   {"modification-time", no_argument, 0, OBSOLETE_TOUCH},  
218    {"multi-volume", no_argument, 0, 'M'},    {"multi-volume", no_argument, 0, 'M'},
219    {"new-volume-script", required_argument, 0, 'F'},    {"new-volume-script", required_argument, 0, 'F'},
220    {"newer", required_argument, 0, 'N'},    {"newer", required_argument, 0, 'N'},
# Line 256  static struct option long_options[] = Line 240  static struct option long_options[] =
240    {"preserve-permissions", no_argument, 0, 'p'},    {"preserve-permissions", no_argument, 0, 'p'},
241    {"recursion", no_argument, &recursion_option, FNM_LEADING_DIR},    {"recursion", no_argument, &recursion_option, FNM_LEADING_DIR},
242    {"recursive-unlink", no_argument, 0, RECURSIVE_UNLINK_OPTION},    {"recursive-unlink", no_argument, 0, RECURSIVE_UNLINK_OPTION},
   {"read-full-blocks", no_argument, 0, OBSOLETE_READ_FULL_RECORDS},  
243    {"read-full-records", no_argument, 0, 'B'},    {"read-full-records", no_argument, 0, 'B'},
244    /* FIXME: --partial-blocks might be a synonym for --read-full-records?  */    /* FIXME: --partial-blocks might be a synonym for --read-full-records?  */
   {"record-number", no_argument, 0, OBSOLETE_BLOCK_NUMBER},  
245    {"record-size", required_argument, 0, RECORD_SIZE_OPTION},    {"record-size", required_argument, 0, RECORD_SIZE_OPTION},
246    {"remove-files", no_argument, 0, REMOVE_FILES_OPTION},    {"remove-files", no_argument, 0, REMOVE_FILES_OPTION},
247    {"rsh-command", required_argument, 0, RSH_COMMAND_OPTION},    {"rsh-command", required_argument, 0, RSH_COMMAND_OPTION},
# Line 282  static struct option long_options[] = Line 264  static struct option long_options[] =
264    {"verbose", no_argument, 0, 'v'},    {"verbose", no_argument, 0, 'v'},
265    {"verify", no_argument, 0, 'W'},    {"verify", no_argument, 0, 'W'},
266    {"version", no_argument, &show_version, 1},    {"version", no_argument, &show_version, 1},
   {"version-control", required_argument, 0, OBSOLETE_VERSION_CONTROL},  
267    {"volno-file", required_argument, 0, VOLNO_FILE_OPTION},    {"volno-file", required_argument, 0, VOLNO_FILE_OPTION},
268    {"wildcards", no_argument, 0, WILDCARDS_OPTION},    {"wildcards", no_argument, 0, WILDCARDS_OPTION},
269    {"wildcards-match-slash", no_argument, 0, WILDCARDS_MATCH_SLASH_OPTION},    {"wildcards-match-slash", no_argument, 0, WILDCARDS_MATCH_SLASH_OPTION},
# Line 618  decode_options (int argc, char **argv) Line 599  decode_options (int argc, char **argv)
599          set_subcommand_option (CAT_SUBCOMMAND);          set_subcommand_option (CAT_SUBCOMMAND);
600          break;          break;
601    
       case OBSOLETE_BLOCK_COMPRESS:  
         WARN ((0, 0, _("Obsolete option, now implied by --blocking-factor")));  
         break;  
   
       case OBSOLETE_BLOCKING_FACTOR:  
         WARN ((0, 0, _("Obsolete option name replaced by --blocking-factor")));  
         /* Fall through.  */  
   
602        case 'b':        case 'b':
603          {          {
604            uintmax_t u;            uintmax_t u;
# Line 638  decode_options (int argc, char **argv) Line 611  decode_options (int argc, char **argv)
611          }          }
612          break;          break;
613    
       case OBSOLETE_READ_FULL_RECORDS:  
         WARN ((0, 0,  
                _("Obsolete option name replaced by --read-full-records")));  
         /* Fall through.  */  
   
614        case 'B':        case 'B':
615          /* Try to reblock input records.  For reading 4.2BSD pipes.  */          /* Try to reblock input records.  For reading 4.2BSD pipes.  */
616    
# Line 751  decode_options (int argc, char **argv) Line 719  decode_options (int argc, char **argv)
719          }          }
720          break;          break;
721    
       case OBSOLETE_TOUCH:  
         WARN ((0, 0, _("Obsolete option name replaced by --touch")));  
         /* Fall through.  */  
   
722        case 'm':        case 'm':
723          touch_option = 1;          touch_option = 1;
724          break;          break;
# Line 812  decode_options (int argc, char **argv) Line 776  decode_options (int argc, char **argv)
776          same_permissions_option = 1;          same_permissions_option = 1;
777          break;          break;
778    
       case OBSOLETE_ABSOLUTE_NAMES:  
         WARN ((0, 0, _("Obsolete option name replaced by --absolute-names")));  
         /* Fall through.  */  
   
779        case 'P':        case 'P':
780          absolute_names_option = 1;          absolute_names_option = 1;
781          break;          break;
# Line 824  decode_options (int argc, char **argv) Line 784  decode_options (int argc, char **argv)
784          set_subcommand_option (APPEND_SUBCOMMAND);          set_subcommand_option (APPEND_SUBCOMMAND);
785          break;          break;
786    
       case OBSOLETE_BLOCK_NUMBER:  
         WARN ((0, 0, _("Obsolete option name replaced by --block-number")));  
         /* Fall through.  */  
   
787        case 'R':        case 'R':
788          /* Print block numbers for debugging bad tar archives.  */          /* Print block numbers for debugging bad tar archives.  */
789    
# Line 910  decode_options (int argc, char **argv) Line 866  decode_options (int argc, char **argv)
866          set_use_compress_program_option ("compress");          set_use_compress_program_option ("compress");
867          break;          break;
868    
       case OBSOLETE_VERSION_CONTROL:  
         WARN ((0, 0, _("Obsolete option name replaced by --backup")));  
         /* Fall through.  */  
   
869        case ANCHORED_OPTION:        case ANCHORED_OPTION:
870          exclude_options |= EXCLUDE_ANCHORED;          exclude_options |= EXCLUDE_ANCHORED;
871          break;          break;

Legend:
Removed from v.1.58  
changed lines
  Added in v.1.59

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26