diff options
Diffstat (limited to 'libbb/xfuncs.c')
| -rw-r--r-- | libbb/xfuncs.c | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index f1d4486c3..de765a32d 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -20,7 +20,6 @@ * Since dmalloc's prototypes overwrite the impls here as they are * included after these prototypes in libbb.h, all is well. */ -#ifdef L_xmalloc // Die if we can't allocate size bytes of memory. void *xmalloc(size_t size) { @@ -29,9 +28,7 @@ void *xmalloc(size_t size) bb_error_msg_and_die(bb_msg_memory_exhausted); return ptr; } -#endif -#ifdef L_xrealloc // Die if we can't resize previously allocated memory. (This returns a pointer // to the new memory, which may or may not be the same as the old memory. // It'll copy the contents to a new chunk and free the old one if necessary.) @@ -42,11 +39,8 @@ void *xrealloc(void *ptr, size_t size) bb_error_msg_and_die(bb_msg_memory_exhausted); return ptr; } -#endif #endif /* DMALLOC */ - -#ifdef L_xzalloc // Die if we can't allocate and zero size bytes of memory. void *xzalloc(size_t size) { @@ -54,9 +48,7 @@ void *xzalloc(size_t size) memset(ptr, 0, size); return ptr; } -#endif -#ifdef L_xstrdup // Die if we can't copy a string to freshly allocated memory. char * xstrdup(const char *s) { @@ -72,9 +64,7 @@ char * xstrdup(const char *s) return t; } -#endif -#ifdef L_xstrndup // Die if we can't allocate n+1 bytes (space for the null terminator) and copy // the (possibly truncated to length n) string into it. char * xstrndup(const char *s, int n) @@ -88,9 +78,7 @@ char * xstrndup(const char *s, int n) return safe_strncpy(t,s,n); } -#endif -#ifdef L_xfopen // Die if we can't open a file and return a FILE * to it. // Notice we haven't got xfread(), This is for use with fscanf() and friends. FILE *xfopen(const char *path, const char *mode) @@ -100,9 +88,7 @@ FILE *xfopen(const char *path, const char *mode) bb_perror_msg_and_die("%s", path); return fp; } -#endif -#ifdef L_xopen // Die if we can't open an existing file and return an fd. int xopen(const char *pathname, int flags) { @@ -111,9 +97,7 @@ int xopen(const char *pathname, int flags) return xopen3(pathname, flags, 0777); } -#endif -#ifdef L_xopen3 // Die if we can't open a new file and return an fd. int xopen3(const char *pathname, int flags, int mode) { @@ -125,9 +109,7 @@ int xopen3(const char *pathname, int flags, int mode) } return ret; } -#endif -#ifdef L_xread // Die with an error message if we can't read the entire buffer. void xread(int fd, void *buf, size_t count) { @@ -140,9 +122,7 @@ void xread(int fd, void *buf, size_t count) buf = ((char *) buf) + size; } } -#endif -#ifdef L_xwrite // Die with an error message if we can't write the entire buffer. void xwrite(int fd, void *buf, size_t count) { @@ -155,17 +135,13 @@ void xwrite(int fd, void *buf, size_t count) buf = ((char *) buf) + size; } } -#endif -#ifdef L_xlseek // Die with an error message if we can't lseek to the right spot. void xlseek(int fd, off_t offset, int whence) { if (offset != lseek(fd, offset, whence)) bb_error_msg_and_die("lseek"); } -#endif -#ifdef L_xread_char // Die with an error message if we can't read one character. unsigned char xread_char(int fd) { @@ -175,9 +151,7 @@ unsigned char xread_char(int fd) return(tmp); } -#endif -#ifdef L_xferror // Die with supplied error message if this FILE * has ferror set. void xferror(FILE *fp, const char *fn) { @@ -185,17 +159,13 @@ void xferror(FILE *fp, const char *fn) bb_error_msg_and_die("%s", fn); } } -#endif -#ifdef L_xferror_stdout // Die with an error message if stdout has ferror set. void xferror_stdout(void) { xferror(stdout, bb_msg_standard_output); } -#endif -#ifdef L_xfflush_stdout // Die with an error message if we have trouble flushing stdout. void xfflush_stdout(void) { @@ -203,9 +173,7 @@ void xfflush_stdout(void) bb_perror_msg_and_die(bb_msg_standard_output); } } -#endif -#ifdef L_spawn // This does a fork/exec in one call, using vfork(). Return PID of new child, // -1 for failure. Runs argv[0], searching path if that has no / in it. pid_t spawn(char **argv) @@ -230,9 +198,7 @@ pid_t spawn(char **argv) } return failed ? failed : pid; } -#endif -#ifdef L_xspawn // Die with an error message if we can't spawn a child process. pid_t xspawn(char **argv) { @@ -240,9 +206,7 @@ pid_t xspawn(char **argv) if (pid < 0) bb_perror_msg_and_die("%s", *argv); return pid; } -#endif -#ifdef L_wait4 // Wait for the specified child PID to exit, returning child's error return. int wait4pid(int pid) { @@ -253,17 +217,13 @@ int wait4pid(int pid) if (WIFSIGNALED(status)) return WTERMSIG(status); return 0; } -#endif -#ifdef L_xsetenv void xsetenv(const char *key, const char *value) { if(setenv(key, value, 1)) bb_error_msg_and_die(bb_msg_memory_exhausted); } -#endif -#ifdef L_itoa // Convert unsigned integer to ascii, writing into supplied buffer. A // truncated result is always null terminated (unless buflen is 0), and // contains the first few digits of the result ala strncpy. @@ -319,9 +279,7 @@ char *itoa(int n) return local_buf; } -#endif -#ifdef L_setuid // Die with an error message if we can't set gid. (Because resource limits may // limit this user to a given number of processes, and if that fills up the // setgid() will fail and we'll _still_be_root_, which is bad.) @@ -335,9 +293,7 @@ void xsetuid(uid_t uid) { if (setuid(uid)) bb_error_msg_and_die("setuid"); } -#endif -#ifdef L_fdlength // Return how long the file at fd is, if there's any way to determine it. off_t fdlength(int fd) { @@ -375,9 +331,7 @@ off_t fdlength(int fd) return pos + 1; } -#endif -#ifdef L_xasprintf // Die with an error message if we can't malloc() enough space and do an // sprintf() into that space. char *xasprintf(const char *format, ...) @@ -405,9 +359,7 @@ char *xasprintf(const char *format, ...) if (r < 0) bb_error_msg_and_die(bb_msg_memory_exhausted); return string_ptr; } -#endif -#ifdef L_xprint_and_close_file // Die with an error message if we can't copy an entire FILE * to stdout, then // close that file. void xprint_and_close_file(FILE *file) @@ -418,18 +370,14 @@ void xprint_and_close_file(FILE *file) fclose(file); } -#endif -#ifdef L_xchdir // Die if we can't chdir to a new path. void xchdir(const char *path) { if (chdir(path)) bb_perror_msg_and_die("chdir(%s)", path); } -#endif -#ifdef L_warn_opendir // Print a warning message if opendir() fails, but don't die. DIR *warn_opendir(const char *path) { @@ -441,9 +389,7 @@ DIR *warn_opendir(const char *path) } return dp; } -#endif -#ifdef L_xopendir // Die with an error message if opendir() fails. DIR *xopendir(const char *path) { @@ -453,9 +399,7 @@ DIR *xopendir(const char *path) bb_perror_msg_and_die("unable to open `%s'", path); return dp; } -#endif -#ifdef L_xdaemon #ifndef BB_NOMMU // Die with an error message if we can't daemonize. void xdaemon(int nochdir, int noclose) @@ -463,9 +407,7 @@ void xdaemon(int nochdir, int noclose) if (daemon(nochdir, noclose)) bb_perror_msg_and_die("daemon"); } #endif -#endif -#ifdef L_xsocket // Die with an error message if we can't open a new socket. int xsocket(int domain, int type, int protocol) { @@ -475,34 +417,26 @@ int xsocket(int domain, int type, int protocol) return r; } -#endif -#ifdef L_xbind // Die with an error message if we can't bind a socket to an address. void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen) { if (bind(sockfd, my_addr, addrlen)) bb_perror_msg_and_die("bind"); } -#endif -#ifdef L_xlisten // Die with an error message if we can't listen for connections on a socket. 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(char *name, struct stat *stat_buf) { if (stat(name, stat_buf)) bb_perror_msg_and_die("can't stat '%s'", name); } -#endif -#ifdef L_get_terminal_width_height /* It is perfectly ok to pass in a NULL for either width or for * * height, in which case that value will not be set. */ int get_terminal_width_height(int fd, int *width, int *height) @@ -524,4 +458,3 @@ int get_terminal_width_height(int fd, int *width, int *height) return ret; } -#endif |