tar: support -T - and -X -

[oweals/busybox.git] / libbb / wfopen_input.c

diff --git a/libbb/wfopen_input.c b/libbb/wfopen_input.c
index 3da855fe612daac966ea89adb815ebf33fb0f648..d8b1c4a36d728570b2516acbb8e23343e8e8829a 100644 (file)
--- a/libbb/wfopen_input.c
+++ b/libbb/wfopen_input.c
@@ -4,28 +4,53 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* A number of applets need to open a file for reading, where the filename
  * is a command line arg.  Since often that arg is '-' (meaning stdin),
  * we avoid testing everywhere by consolidating things in this routine.
- *
- * Note: We also consider "" to main stdin (for 'cmp' at least).
  */
 
 #include "libbb.h"
 
-FILE *fopen_or_warn_stdin(const char *filename)
+FILE* FAST_FUNC fopen_or_warn_stdin(const char *filename)
 {
        FILE *fp = stdin;
 
        if (filename != bb_msg_standard_input
-        && filename[0]
-        && (filename[0] != '-' || filename[1])
+        && NOT_LONE_DASH(filename)
        ) {
                fp = fopen_or_warn(filename, "r");
        }
-
        return fp;
 }
+
+FILE* FAST_FUNC xfopen_stdin(const char *filename)
+{
+       FILE *fp = fopen_or_warn_stdin(filename);
+       if (fp)
+               return fp;
+       xfunc_die();  /* We already output an error message. */
+}
+
+int FAST_FUNC open_or_warn_stdin(const char *filename)
+{
+       int fd = STDIN_FILENO;
+
+       if (filename != bb_msg_standard_input
+        && NOT_LONE_DASH(filename)
+       ) {
+               fd = open_or_warn(filename, O_RDONLY);
+       }
+
+       return fd;
+}
+
+int FAST_FUNC xopen_stdin(const char *filename)
+{
+       int fd = open_or_warn_stdin(filename);
+       if (fd >= 0)
+               return fd;
+       xfunc_die();  /* We already output an error message. */
+}