emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- merge xstat.c into xfuncs.c

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer 2006-09-11 09:18:09 +00:00
parent dea6e3d3cf
commit 57b56674a3
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libbb.h
View File

@ -189,7 +189,7 @@ extern FILE *xfopen(const char *path, const char *mode);
extern int bb_fclose_nonstdin(FILE *f);
extern void bb_fflush_stdout_and_exit(int retval) ATTRIBUTE_NORETURN;
extern void xstat(const char *filename, struct stat *buf);
extern void xstat(const char * const filename, struct stat *buf);
extern int xsocket(int domain, int type, int protocol);
extern pid_t spawn(char **argv);
extern pid_t xspawn(char **argv);

2
libbb/Makefile.in
View File

@ -29,7 +29,7 @@ LIBBB-y:= \
safe_strncpy.c setup_environment.c sha1.c simplify_path.c \
trim.c u_signal_names.c vdprintf.c verror_msg.c \
info_msg.c vinfo_msg.c \
vherror_msg.c vperror_msg.c wfopen.c xconnect.c xgetcwd.c xstat.c \
vherror_msg.c vperror_msg.c wfopen.c xconnect.c xgetcwd.c \
xgethostbyname.c xgethostbyname2.c xreadlink.c xgetlarg.c \
get_terminal_width_height.c fclose_nonstdin.c fflush_stdout_and_exit.c \
getopt_ulflags.c default_error_retval.c wfopen_input.c speed_table.c \

10
libbb/xfuncs.c
View File

@ -487,3 +487,13 @@ void xlisten(int s, int backlog)
if (listen(s, backlog)) bb_perror_msg_and_die("listen");
}
#endif
#ifdef L_xstat
/* xstat() - a stat() which dies on failure with meaningful error message */
void xstat(const char * const name, struct stat *stat_buf)
{
if (stat(name, stat_buf))
bb_perror_msg_and_die("Can't stat '%s'", name);
}
#endif

12
libbb/xstat.c
View File

@ -1,12 +0,0 @@
/* vi: set sw=4 ts=4: */
/*
* xstat.c - a stat() which dies on failure with meaningful error message
*/
#include <unistd.h>
#include "libbb.h"
void xstat(const char *name, struct stat *stat_buf)
{
if (stat(name, stat_buf))
bb_perror_msg_and_die("Can't stat '%s'", name);
}