bsdtar: start "fake short equivalents" enum higher (#2586)

This avoids possible conflict with command-line options such as -B.

diff --git a/tar/bsdtar.c b/tar/bsdtar.c
index bce8344fc4a06e065d5505946ba7eca7057fa80c..c656cfbc81f0779880a08e7d4a042e35852e4a26 100644 (file)
--- a/tar/bsdtar.c
+++ b/tar/bsdtar.c
@@ -104,7 +104,7 @@ need_report(void)
 static __LA_NORETURN void               long_help(void);
 static void             only_mode(struct bsdtar *, const char *opt,
                             const char *valid);
-static void             set_mode(struct bsdtar *, char opt);
+static void             set_mode(struct bsdtar *, int opt);
 static __LA_NORETURN void               version(void);
 
 /* A basic set of security flags to request from libarchive. */
@@ -139,7 +139,7 @@ main(int argc, char **argv)
 {
        struct bsdtar           *bsdtar, bsdtar_storage;
        int                      opt, t;
-       char                     compression, compression2;
+       int                      compression, compression2;
        const char              *compression_name, *compression2_name;
        const char              *compress_program;
        char                    *tptr, *uptr;
@@ -938,7 +938,7 @@ main(int argc, char **argv)
                switch (compression) {
                case 'J': case 'j': case 'y': case 'Z': case 'z':
                        strcpy(buff, "-?");
-                       buff[1] = compression;
+                       buff[1] = (char)compression;
                        break;
                default:
                        strcpy(buff, "--");
@@ -1008,7 +1008,7 @@ main(int argc, char **argv)
 }
 
 static void
-set_mode(struct bsdtar *bsdtar, char opt)
+set_mode(struct bsdtar *bsdtar, int opt)
 {
        if (bsdtar->mode != '\0' && bsdtar->mode != opt)
                lafe_errc(1, 0,

diff --git a/tar/bsdtar.h b/tar/bsdtar.h
index 42520c88f2bc76325a6803d7c6d850f81eb99703..65ab969b830f95174a2d96e05f86847a657ea812 100644 (file)
--- a/tar/bsdtar.h
+++ b/tar/bsdtar.h
@@ -42,7 +42,7 @@ struct bsdtar {
        int               uid;  /* --uid */
        const char       *uname; /* --uname */
        const char       *passphrase; /* --passphrase */
-       char              mode; /* Program mode: 'c', 't', 'r', 'u', 'x' */
+       int               mode; /* Program mode: 'c', 't', 'r', 'u', 'x' */
        char              symlink_mode; /* H or L, per BSD conventions */
        const char       *option_options; /* --options */
        char              day_first; /* show day before month in -tv output */
@@ -114,7 +114,7 @@ struct bsdtar {
 
 /* Fake short equivalents for long options that otherwise lack them. */
 enum {
-       OPTION_ACLS = 1,
+       OPTION_ACLS = 256,
        OPTION_B64ENCODE,
        OPTION_CHECK_LINKS,
        OPTION_CHROOT,