7 files changed, 7 insertions, 8 deletions

diff --git a/archival/bunzip2.c b/archival/bunzip2.c
index 757001fe4..a6cd17611 100644
--- a/archival/bunzip2.c
+++ b/archival/bunzip2.c
@@ -23,7 +23,7 @@ int bunzip2_main(int argc, char **argv)
 
         /* Set input filename and number */
         filename = argv[optind];
-        if ((filename) && (filename[0] != '-') && (filename[1] != '\0')) {
+        if (filename && NOT_LONE_DASH(filename)) {
                 /* Open input file */
                 src_fd = xopen(filename, O_RDONLY);
         } else {
diff --git a/archival/gunzip.c b/archival/gunzip.c
index e24401c71..c5deec3ce 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -58,7 +58,7 @@ int gunzip_main(int argc, char **argv)
 
                 optind++;
 
-                if (old_path == NULL || strcmp(old_path, "-") == 0) {
+                if (old_path == NULL || LONE_DASH(old_path)) {
                         src_fd = STDIN_FILENO;
                         opt |= GUNZIP_OPT_STDOUT;
                         USE_DESKTOP(opt &= ~GUNZIP_OPT_VERBOSE;)
diff --git a/archival/gzip.c b/archival/gzip.c
index c9b67538e..7124e9bd4 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -1201,7 +1201,7 @@ int gzip_main(int argc, char **argv)
                         char *path = NULL;
 
                         clear_bufs();
-                        if (strcmp(argv[i], "-") == 0) {
+                        if (LONE_DASH(argv[i])) {
                                 time_stamp = 0;
                                 inFileNum = STDIN_FILENO;
                                 outFileNum = STDOUT_FILENO;
diff --git a/archival/tar.c b/archival/tar.c
index 79c3595ac..ba7cb0f8c 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -851,7 +851,7 @@ int tar_main(int argc, char **argv)
                         flags = O_RDONLY;
                 }
 
-                if (tar_filename[0] == '-' && !tar_filename[1]) {
+                if (LONE_DASH(tar_filename)) {
                         tar_handle->src_fd = fileno(tar_stream);
                         tar_handle->seek = seek_by_read;
                 } else {
diff --git a/archival/uncompress.c b/archival/uncompress.c
index 3c78961d5..461179016 100644
--- a/archival/uncompress.c
+++ b/archival/uncompress.c
@@ -25,7 +25,7 @@ int uncompress_main(int argc, char **argv)
                 int src_fd;
                 int dst_fd;
 
-                if (strcmp(compressed_file, "-") == 0) {
+                if (LONE_DASH(compressed_file)) {
                         src_fd = STDIN_FILENO;
                         flags |= GUNZIP_TO_STDOUT;
                 } else {
diff --git a/archival/unlzma.c b/archival/unlzma.c
index 46fbefdc0..20c4ff2a7 100644
--- a/archival/unlzma.c
+++ b/archival/unlzma.c
@@ -26,7 +26,7 @@ int unlzma_main(int argc, char **argv)
 
         /* Set input filename and number */
         filename = argv[optind];
-        if (filename && (filename[0] != '-') && (filename[1] != '\0')) {
+        if (filename && NOT_LONE_DASH(filename)) {
                 /* Open input file */
                 src_fd = xopen(filename, O_RDONLY);
         } else {
diff --git a/archival/unzip.c b/archival/unzip.c
index 8b1c281c4..f553eefa2 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -187,11 +187,10 @@ int unzip_main(int argc, char **argv)
         }
 
         /* Open input file */
-        if (strcmp("-", src_fn) == 0) {
+        if (LONE_DASH(src_fn)) {
                 src_fd = STDIN_FILENO;
                 /* Cannot use prompt mode since zip data is arriving on STDIN */
                 overwrite = (overwrite == o_prompt) ? o_never : overwrite;
-
         } else {
                 static const char *const extn[] = {"", ".zip", ".ZIP"};
                 int orig_src_fn_len = strlen(src_fn);