summaryrefslogtreecommitdiff
path: root/libbb/print_file.c
diff options
context:
space:
mode:
authorEric Andersen2001-04-09 22:48:12 +0000
committerEric Andersen2001-04-09 22:48:12 +0000
commite5dfced23a904d08afa5dcee190c3c3d845d9f50 (patch)
treeef367ee8a9096884fb40debdc9e10af8583f9d5f /libbb/print_file.c
parenta75e2867435faa68ea03735fe09ad298fa3e4e72 (diff)
downloadbusybox-e5dfced23a904d08afa5dcee190c3c3d845d9f50.zip
busybox-e5dfced23a904d08afa5dcee190c3c3d845d9f50.tar.gz
Apply Vladimir's latest cleanup patch.
-Erik
Diffstat (limited to 'libbb/print_file.c')
-rw-r--r--libbb/print_file.c29
1 files changed, 17 insertions, 12 deletions
diff --git a/libbb/print_file.c b/libbb/print_file.c
index 52a3977..b477234 100644
--- a/libbb/print_file.c
+++ b/libbb/print_file.c
@@ -2,9 +2,7 @@
/*
* Utility routines.
*
- * Copyright (C) tons of folks. Tracking down who wrote what
- * isn't something I'm going to worry about... If you wrote something
- * here, please feel free to acknowledge your work.
+ * Copyright (C) 1999-2001 Erik Andersen <andersee@debian.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
@@ -19,13 +17,10 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
- * Permission has been granted to redistribute this code under the GPL.
- *
*/
#include <stdio.h>
+#include <sys/stat.h>
#include "libbb.h"
@@ -41,11 +36,21 @@ extern void print_file(FILE *file)
extern int print_file_by_name(char *filename)
{
- FILE *file;
- if ((file = wfopen(filename, "r")) == NULL)
- return FALSE;
- print_file(file);
- return TRUE;
+ 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;
+ }
+
+ return status;
}