Patch from vodz:

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

diff --git a/libbb/print_file.c b/libbb/print_file.c
index a6df14ed9558f8394eb1ca664298e65c46e5c62a..6d3667b60a282333d87b4ac3779302b424cc045c 100644 (file)
--- a/libbb/print_file.c
+++ b/libbb/print_file.c
@@ -2,7 +2,7 @@
 /*
  * Utility routines.
  *
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,37 +20,51 @@
  */
 
 #include <stdio.h>
-#include <sys/stat.h>
+#include <stdlib.h>
 #include "libbb.h"
 
-
-extern void print_file(FILE *file)
+extern void bb_xprint_and_close_file(FILE *file)
 {
-       fflush(stdout);
-       copyfd(fileno(file), fileno(stdout));
+       bb_xfflush_stdout();
+       /* Note: Do not use STDOUT_FILENO here, as this is a lib routine
+        *       and the calling code may have reassigned stdout. */
+       if (bb_copyfd(fileno(file), fileno(stdout), 0) == -1) {
+               /* bb_copyfd outputs any needed messages, so just die. */
+               exit(bb_default_error_retval);
+       }
+       /* Note: Since we're reading, don't bother checking the return value
+        *       of fclose().  The only possible failure is EINTR which
+        *       should already have been taken care of. */
        fclose(file);
 }
 
-extern int print_file_by_name(char *filename)
+/* Returns:
+ *    0      if successful
+ *   -1      if 'filename' does not exist or is a directory
+ *  exits with default error code if an error occurs
+ */
+
+extern int bb_xprint_file_by_name(const char *filename)
 {
+       FILE *f;
+
+#if 0
+       /* This check shouldn't be necessary for linux, but is left
+       * here disabled just in case. */
        struct stat statBuf;
-       int status = TRUE;
-
-       if(is_directory(filename, TRUE, &statBuf)==TRUE) {
-               error_msg("%s: Is directory", filename);
-               status = FALSE;
-       } else {
-               FILE *f = wfopen(filename, "r");
-               if(f!=NULL)
-                       print_file(f);
-               else
-                       status = FALSE;
+
+       if(is_directory(filename, TRUE, &statBuf)) {
+               bb_error_msg("%s: Is directory", filename);
+       } else
+#endif
+       if ((f = bb_wfopen(filename, "r")) != NULL) {
+               bb_xprint_and_close_file(f);
+               return 0;
        }
 
-       return status;
+       return -1;
 }
 
-
 /* END CODE */
 /*
 Local Variables: