Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/wfopen_input.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/wfopen_input.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/libbb/wfopen_input.c

@@ -5 +5 @@
  * 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.
  */
 
@@ -11 +11 @@
  * 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 mean 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]
      && 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. */
+}