Prefer other types to int in tar.c

Use types that are more specific than ‘int’, if that is easy.
* src/tar.c (after_date_option, xattrs_option, check_links_option)
(confirm, confirm_file_EOF, set_xattr_option, optloc_eq)
(get_date_or_file):
Prefer bool to int.
(tar_list_quoting_styles, tar_set_quoting_style, parse_opt):
Prefer idx_t to int.
(optloc_lookup, option_set_in_cl): Prefer enum option_class to int.
(decode_signal): Avoid some pointer reallocation.
(sort_mode_flag, hole_detection_types, set_old_files_option)
(is_subcommand_class): Prefer enum to int.
(parse_opt) [DEVICE_PREFIX]: Remove unused var.
Simplify creation of device name.
(find_argp_option_key, find_argp_option): Prefer char to int.
(enum subcommand_class): Now named.
(subcommand_class): Now char, not int.
(decode_options): Check for unlikely int overflow.

diff --git a/src/common.h b/src/common.h
index 4b25e089fd72a3437576bc1efb952a10a8a5accc..e8e94bde9732ac422411f93795fa8f2b10f36ee6 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -109,11 +109,11 @@ extern bool utc_option;
 /* Output file timestamps to the full resolution */
 extern bool full_time_option;
 
-/* This variable tells how to interpret newer_mtime_option, below.  If zero,
+/* This variable tells how to interpret newer_mtime_option, below.  If false,
    files get archived if their mtime is not less than newer_mtime_option.
-   If nonzero, files get archived if *either* their ctime or mtime is not less
+   If true, files get archived if *either* their ctime or mtime is not less
    than newer_mtime_option.  */
-extern int after_date_option;
+extern bool after_date_option;
 
 enum atime_preserve
 {
@@ -274,8 +274,8 @@ extern int selinux_context_option;
 /* If positive, save the ACLs.  */
 extern int acls_option;
 
-/* If positive, save the user and root xattrs.  */
-extern int xattrs_option;
+/* If true, save the user and root xattrs.  */
+extern bool xattrs_option;
 
 /* When set, strip the given number of file name components from the file name
    before extracting */
@@ -816,7 +816,7 @@ wasfound (struct name const *c)
 
 _Noreturn void usage (int);
 
-int confirm (const char *message_action, const char *name);
+bool confirm (const char *message_action, const char *name);
 
 void tar_stat_init (struct tar_stat_info *st);
 bool tar_stat_close (struct tar_stat_info *st);

diff --git a/src/create.c b/src/create.c
index bc61c3daedcd1bb66888648d1d81cc4de348d492..e948d13ee7bda7ad1b504b19180d14865fea186b 100644 (file)
--- a/src/create.c
+++ b/src/create.c
@@ -936,7 +936,7 @@ start_header (struct tar_stat_info *st)
         }
       if ((selinux_context_option > 0) && st->cntx_name)
         xheader_store ("RHT.security.selinux", st, NULL);
-      if (xattrs_option > 0)
+      if (xattrs_option)
        for (idx_t i = 0; i < st->xattr_map.xm_size; i++)
          xheader_store (st->xattr_map.xm_map[i].xkey, st, &i);
     }

diff --git a/src/extract.c b/src/extract.c
index 89d1999fffa4ca8608199dd229dfb14ec84e40fb..a64c214cd2a3569f335fa805198e2bd4cae3403a 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -937,7 +937,7 @@ set_xattr (char const *file_name, struct tar_stat_info const *st,
            mode_t mode, char typeflag)
 {
 #ifdef HAVE_XATTRS
-  if ((xattrs_option > 0) && st->xattr_map.xm_size)
+  if (xattrs_option && st->xattr_map.xm_size)
     {
       int r = mknodat (chdir_fd, file_name, mode, 0);
       if (r < 0)

diff --git a/src/tar.c b/src/tar.c
index af02d5189376b63fdb16cfa149bceca1bef10ea2..ea2b2f3b9218de89e397e188c91fe7236f167609 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -39,7 +39,7 @@ idx_t record_size;
 bool absolute_names_option;
 bool utc_option;
 bool full_time_option;
-int after_date_option;
+bool after_date_option;
 enum atime_preserve atime_preserve_option;
 bool backup_option;
 enum backup_type backup_type;
@@ -86,7 +86,7 @@ int same_owner_option;
 int same_permissions_option;
 int selinux_context_option;
 int acls_option;
-int xattrs_option;
+bool xattrs_option;
 idx_t strip_name_components;
 bool show_omitted_dirs_option;
 bool sparse_option;
@@ -151,7 +151,7 @@ bool delay_directory_restore_option;
 #endif
 
 /* Print a message if not all links are dumped */
-static int check_links_option;
+static bool check_links_option;
 
 /* Number of allocated tape drive names.  */
 static idx_t allocated_archive_names;
@@ -174,11 +174,11 @@ request_stdin (const char *option)
 }
 
 /* Returns true if and only if the user typed an affirmative response.  */
-int
+bool
 confirm (const char *message_action, const char *message_name)
 {
   static FILE *confirm_file;
-  static int confirm_file_EOF;
+  static bool confirm_file_EOF;
   bool status = false;
 
   if (!confirm_file)
@@ -204,7 +204,7 @@ confirm (const char *message_action, const char *message_name)
       char *response = NULL;
       size_t response_size = 0;
       if (getline (&response, &response_size, confirm_file) < 0)
-       confirm_file_EOF = 1;
+       confirm_file_EOF = true;
       else
        status = rpmatch (response) > 0;
       free (response);
@@ -249,9 +249,9 @@ set_archive_format (char const *name)
 }
 
 static void
-set_xattr_option (int value)
+set_xattr_option (bool value)
 {
-  if (value == 1)
+  if (value)
     set_archive_format ("posix");
   xattrs_option = value;
 }
@@ -321,10 +321,9 @@ subcommand_string (enum subcommand c)
 static void
 tar_list_quoting_styles (struct obstack *stk, char const *prefix)
 {
-  int i;
   idx_t prefixlen = strlen (prefix);
 
-  for (i = 0; quoting_style_args[i]; i++)
+  for (idx_t i = 0; quoting_style_args[i]; i++)
     {
       obstack_grow (stk, prefix, prefixlen);
       obstack_grow (stk, quoting_style_args[i],
@@ -336,9 +335,7 @@ tar_list_quoting_styles (struct obstack *stk, char const *prefix)
 static void
 tar_set_quoting_style (char *arg)
 {
-  int i;
-
-  for (i = 0; quoting_style_args[i]; i++)
+  for (idx_t i = 0; quoting_style_args[i]; i++)
     if (strcmp (arg, quoting_style_args[i]) == 0)
       {
        set_quoting_style (NULL, i);
@@ -1019,30 +1016,28 @@ optloc_save (enum option_class id, struct option_locus *loc)
 
 /* Return location of a recent option of class ID */
 static struct option_locus *
-optloc_lookup (int id)
+optloc_lookup (enum option_class id)
 {
   return option_class[id];
 }
 
 /* Return true if the latest occurrence of option ID was in the command line */
-static int
-option_set_in_cl (int id)
+static bool
+option_set_in_cl (enum option_class id)
 {
   struct option_locus *loc = optloc_lookup (id);
-  if (!loc)
-    return 0;
-  return loc->source == OPTS_COMMAND_LINE;
+  return loc && loc->source == OPTS_COMMAND_LINE;
 }
 
 /* Compare two option locations */
-static int
+static bool
 optloc_eq (struct option_locus *a, struct option_locus *b)
 {
   assume (a);  /* Pacify GCC bug 106436.  */
   if (a->source != b->source)
-    return 0;
+    return false;
   if (a->source == OPTS_COMMAND_LINE)
-    return 1;
+    return true;
   assume (a->name);
   return strcmp (a->name, b->name) == 0;
 }
@@ -1102,7 +1097,7 @@ decode_signal (const char *name)
 {
   static struct sigtab
   {
-    char const *name;
+    char name[sizeof "USR1"];
     int signo;
   } const sigtab[] = {
     { "USR1", SIGUSR1 },
@@ -1111,12 +1106,12 @@ decode_signal (const char *name)
     { "INT", SIGINT },
     { "QUIT", SIGQUIT }
   };
-  struct sigtab const *p;
+  enum { nsigtab = sizeof sigtab / sizeof *sigtab };
   char const *s = name;
 
   if (strncmp (s, "SIG", 3) == 0)
     s += 3;
-  for (p = sigtab; p < sigtab + sizeof (sigtab) / sizeof (sigtab[0]); p++)
+  for (struct sigtab const *p = sigtab; p < sigtab + nsigtab; p++)
     if (strcmp (p->name, s) == 0)
       return p->signo;
   paxfatal (0, _("Unknown signal name: %s"), name);
@@ -1137,7 +1132,7 @@ struct textual_date
   char *date;
 };
 
-static int
+static bool
 get_date_or_file (struct tar_args *args, const char *option,
                  const char *str, struct timespec *ts)
 {
@@ -1160,7 +1155,7 @@ get_date_or_file (struct tar_args *args, const char *option,
          paxwarn (0, _("Substituting %s for unknown date format %s"),
                   tartime (*ts, false), quote (str));
          ts->tv_nsec = 0;
-         return 1;
+         return false;
        }
       else
        {
@@ -1172,7 +1167,7 @@ get_date_or_file (struct tar_args *args, const char *option,
          args->textual_date = p;
        }
     }
-  return 0;
+  return true;
 }
 
 static void
@@ -1303,7 +1298,7 @@ expand_pax_option (struct tar_args *targs, const char *arg)
              char *tmp = xmalloc (len);
              memcpy (tmp, p + 1, len-2);
              tmp[len-2] = 0;
-             if (get_date_or_file (targs, "--pax-option", tmp, &ts) == 0)
+             if (get_date_or_file (targs, "--pax-option", tmp, &ts))
                {
                  char buf[TIMESPEC_STRSIZE_BOUND];
                  char const *s = code_timespec (ts, buf);
@@ -1369,7 +1364,7 @@ static char const *const sort_mode_arg[] = {
   NULL
 };
 
-static int sort_mode_flag[] = {
+static enum savedir_option const sort_mode_flag[] = {
     SAVEDIR_SORT_NONE,
     SAVEDIR_SORT_NAME,
 #if D_INO_IN_DIRENT
@@ -1384,7 +1379,7 @@ static char const *const hole_detection_args[] =
   "raw", "seek", NULL
 };
 
-static int const hole_detection_types[] =
+static enum hole_detection_method const hole_detection_types[] =
 {
   HOLE_DETECTION_RAW, HOLE_DETECTION_SEEK
 };
@@ -1393,7 +1388,7 @@ ARGMATCH_VERIFY (hole_detection_args, hole_detection_types);
 
 \f
 static void
-set_old_files_option (int code, struct option_locus *loc)
+set_old_files_option (enum old_files code, struct option_locus *loc)
 {
   struct option_locus *prev;
   /* Option compatibility map. 0 means two options are incompatible. */
@@ -1436,12 +1431,8 @@ parse_opt (int key, char *arg, struct argp_state *state)
     {
     case ARGP_KEY_INIT:
       if (state->root_argp->children)
-       {
-         int i;
-
-         for (i = 0; state->root_argp->children[i].argp; i++)
-           state->child_inputs[i] = state->input;
-       }
+       for (idx_t i = 0; state->root_argp->children[i].argp; i++)
+         state->child_inputs[i] = state->input;
       break;
 
     case ARGP_KEY_ARG:
@@ -1526,15 +1517,13 @@ parse_opt (int key, char *arg, struct argp_state *state)
 #ifdef DEVICE_PREFIX
       {
        int device = key - '0';
-       int density;
-       static char buf[sizeof DEVICE_PREFIX + 10];
-       char *cursor;
+       static char buf[sizeof DEVICE_PREFIX + INT_STRLEN_BOUND (int)]
+         = DEVICE_PREFIX;
 
        if (arg[1])
          argp_error (state, _("Malformed density argument: %s"), quote (arg));
 
-       strcpy (buf, DEVICE_PREFIX);
-       cursor = buf + strlen (buf);
+       char *cursor = buf + sizeof DEVICE_PREFIX - 1;
 
 #ifdef DENSITY_LETTER
 
@@ -1645,7 +1634,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
       break;
 
     case 'l':
-      check_links_option = 1;
+      check_links_option = true;
       break;
 
     case 'L':
@@ -2190,16 +2179,16 @@ parse_opt (int key, char *arg, struct argp_state *state)
       break;
 
     case XATTR_OPTION:
-      set_xattr_option (1);
+      set_xattr_option (true);
       break;
 
     case NO_XATTR_OPTION:
-      set_xattr_option (-1);
+      set_xattr_option (false);
       break;
 
     case XATTR_INCLUDE:
     case XATTR_EXCLUDE:
-      set_xattr_option (1);
+      set_xattr_option (true);
       xattrs_mask_add (arg, (key == XATTR_INCLUDE));
       break;
 
@@ -2247,7 +2236,7 @@ usage (int status)
 /* Parse the options for tar.  */
 
 static struct argp_option const *
-find_argp_option_key (struct argp_option const *o, int key)
+find_argp_option_key (struct argp_option const *o, char key)
 {
   for (;
        !(o->name == NULL
@@ -2261,7 +2250,7 @@ find_argp_option_key (struct argp_option const *o, int key)
 }
 
 static struct argp_option const *
-find_argp_option (struct argp *ap, int key)
+find_argp_option (struct argp *ap, char key)
 {
   struct argp_option const *p = NULL;
   struct argp_child const *child;
@@ -2286,7 +2275,7 @@ static const char *tar_authors[] = {
 };
 \f
 /* Subcommand classes */
-enum
+enum subcommand_class
   {
     SUBCL_READ   = 1 << 0, /* Reads from the archive.  */
     SUBCL_WRITE  = 1 << 1, /* Writes to the archive.  */
@@ -2295,7 +2284,7 @@ enum
     SUBCL_OCCUR  = 1 << 4, /* Allows the use of the occurrence option.  */
   };
 
-static int const subcommand_class[] = {
+static char const subcommand_class[] = {
   [UNKNOWN_SUBCOMMAND  ] = 0,
   [APPEND_SUBCOMMAND   ] = SUBCL_WRITE | SUBCL_UPDATE,
   [CAT_SUBCOMMAND      ] = SUBCL_WRITE,
@@ -2310,7 +2299,7 @@ static int const subcommand_class[] = {
 
 /* Is subcommand_option in class(es) f?  */
 static bool
-is_subcommand_class (int f)
+is_subcommand_class (enum subcommand_class f)
 {
   return subcommand_class[subcommand_option] & f;
 }
@@ -2415,7 +2404,6 @@ decode_options (int argc, char **argv)
       char **new_argv;         /* argv value for rearranged arguments */
       char *const *in;         /* cursor into original argv */
       char **out;              /* cursor into rearranged argv */
-      const char *letter;      /* cursor into old option letters */
       char buffer[3];          /* constructed option buffer */
 
       /* Initialize a constructed option.  */
@@ -2425,8 +2413,11 @@ decode_options (int argc, char **argv)
 
       /* Allocate a new argument array, and copy program name in it.  */
 
-      new_argc = argc - 1 + strlen (argv[1]);
-      new_argv = xmalloc ((new_argc + 1) * sizeof (char *));
+      idx_t new_arg_slots;
+      if (ckd_add (&new_arg_slots, argc, strlen (argv[1]))
+         || ckd_sub (&new_argc, new_arg_slots, 1))
+       xalloc_die ();
+      new_argv = xinmalloc (new_arg_slots, sizeof *new_argv);
       in = argv;
       out = new_argv;
       *out++ = *in++;
@@ -2434,7 +2425,7 @@ decode_options (int argc, char **argv)
       /* Copy each old letter option as a separate option, and have the
         corresponding argument moved next to it.  */
 
-      for (letter = *in++; *letter; letter++)
+      for (char const *letter = *in++; *letter; letter++)
        {
          struct argp_option const *opt;
 
@@ -2641,7 +2632,7 @@ decode_options (int argc, char **argv)
       && !is_subcommand_class (SUBCL_READ))
     paxusage (_("--selinux can be used only on POSIX archives"));
 
-  if ((xattrs_option > 0)
+  if (xattrs_option
       && archive_format != POSIX_FORMAT
       && !is_subcommand_class (SUBCL_READ))
     paxusage (_("--xattrs can be used only on POSIX archives"));

diff --git a/src/xattrs.c b/src/xattrs.c
index e29890877cfecc42149640d1fc53ebd703af017e..fa95ef34e371f3a7d7390c4c0477c83259d6513c 100644 (file)
--- a/src/xattrs.c
+++ b/src/xattrs.c
@@ -520,7 +520,7 @@ void
 xattrs_xattrs_get (int parentfd, char const *file_name,
                    struct tar_stat_info *st, int fd)
 {
-  if (xattrs_option > 0)
+  if (xattrs_option)
     {
 #ifndef HAVE_XATTRS
       static int done = 0;
@@ -715,7 +715,7 @@ void
 xattrs_xattrs_set (struct tar_stat_info const *st,
                    char const *file_name, char typeflag, int later_run)
 {
-  if (xattrs_option > 0)
+  if (xattrs_option)
     {
 #ifndef HAVE_XATTRS
       static int done = 0;
@@ -761,14 +761,14 @@ xattrs_print_char (struct tar_stat_info const *st, char *output)
       return;
     }
 
-  if (xattrs_option > 0 || selinux_context_option > 0 || acls_option > 0)
+  if (xattrs_option || selinux_context_option > 0 || acls_option > 0)
     {
       /* placeholders */
       *output = ' ';
       output[1] = 0;
     }
 
-  if (xattrs_option > 0 && st->xattr_map.xm_size)
+  if (xattrs_option && st->xattr_map.xm_size)
     for (idx_t i = 0; i < st->xattr_map.xm_size; i++)
       {
         char *keyword = st->xattr_map.xm_map[i].xkey + XATTRS_PREFIX_LEN;
@@ -808,7 +808,7 @@ xattrs_print (struct tar_stat_info const *st)
     }
 
   /* xattrs */
-  if (xattrs_option > 0 && st->xattr_map.xm_size)
+  if (xattrs_option && st->xattr_map.xm_size)
     {
       for (idx_t i = 0; i < st->xattr_map.xm_size; i++)
         {