mirror of
https://github.com/sheumann/hush.git
synced 2024-08-16 09:29:16 +00:00
function old new delta display_status - 1231 +1231 read_cmdline - 101 +101 parse_conf 1284 1303 +19 arith 2033 2042 +9 collect_blk 467 474 +7 fsck_main 1909 1911 +2 dhcprelay_main 1125 1122 -3 singlemount 4555 4547 -8 read_close 50 36 -14 get_lcm 123 105 -18 ed_main 3111 3084 -27 func_args 73 28 -45 procps_scan 732 658 -74 top_main 2187 899 -1288 ------------------------------------------------------------------------------ (add/remove: 2/0 grow/shrink: 4/8 up/down: 1369/-1477) Total: -108 bytes text data bss dec hex filename 676048 2744 13968 692760 a9218 busybox_old 675940 2744 13968 692652 a91ac busybox_unstripped
169 lines
3.3 KiB
C
169 lines
3.3 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Utility routines.
|
|
*
|
|
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
|
*/
|
|
|
|
#include "libbb.h"
|
|
|
|
ssize_t safe_read(int fd, void *buf, size_t count)
|
|
{
|
|
ssize_t n;
|
|
|
|
do {
|
|
n = read(fd, buf, count);
|
|
} while (n < 0 && errno == EINTR);
|
|
|
|
return n;
|
|
}
|
|
|
|
/*
|
|
* Read all of the supplied buffer from a file.
|
|
* This does multiple reads as necessary.
|
|
* Returns the amount read, or -1 on an error.
|
|
* A short read is returned on an end of file.
|
|
*/
|
|
ssize_t full_read(int fd, void *buf, size_t len)
|
|
{
|
|
ssize_t cc;
|
|
ssize_t total;
|
|
|
|
total = 0;
|
|
|
|
while (len) {
|
|
cc = safe_read(fd, buf, len);
|
|
|
|
if (cc < 0)
|
|
return cc; /* read() returns -1 on failure. */
|
|
if (cc == 0)
|
|
break;
|
|
buf = ((char *)buf) + cc;
|
|
total += cc;
|
|
len -= cc;
|
|
}
|
|
|
|
return total;
|
|
}
|
|
|
|
// Die with an error message if we can't read the entire buffer.
|
|
void xread(int fd, void *buf, size_t count)
|
|
{
|
|
if (count) {
|
|
ssize_t size = full_read(fd, buf, count);
|
|
if (size != count)
|
|
bb_error_msg_and_die("short read");
|
|
}
|
|
}
|
|
|
|
// Die with an error message if we can't read one character.
|
|
unsigned char xread_char(int fd)
|
|
{
|
|
char tmp;
|
|
xread(fd, &tmp, 1);
|
|
return tmp;
|
|
}
|
|
|
|
// Read one line a-la fgets. Works only on seekable streams
|
|
char *reads(int fd, char *buffer, size_t size)
|
|
{
|
|
char *p;
|
|
|
|
if (size < 2)
|
|
return NULL;
|
|
size = full_read(fd, buffer, size-1);
|
|
if ((ssize_t)size <= 0)
|
|
return NULL;
|
|
|
|
buffer[size] = '\0';
|
|
p = strchr(buffer, '\n');
|
|
if (p) {
|
|
off_t offset;
|
|
*p++ = '\0';
|
|
// avoid incorrect (unsigned) widening
|
|
offset = (off_t)(p-buffer) - (off_t)size;
|
|
// set fd position right after '\n'
|
|
if (offset && lseek(fd, offset, SEEK_CUR) == (off_t)-1)
|
|
return NULL;
|
|
}
|
|
return buffer;
|
|
}
|
|
|
|
// Read one line a-la fgets. Reads byte-by-byte.
|
|
// Useful when it is important to not read ahead.
|
|
char *xmalloc_reads(int fd, char *buf)
|
|
{
|
|
char *p;
|
|
int sz = buf ? strlen(buf) : 0;
|
|
|
|
goto jump_in;
|
|
while (1) {
|
|
if (p - buf == sz) {
|
|
jump_in:
|
|
buf = xrealloc(buf, sz + 128);
|
|
p = buf + sz;
|
|
sz += 128;
|
|
}
|
|
if (safe_read(fd, p, 1) != 1) { /* EOF/error */
|
|
if (p == buf) {
|
|
/* we read nothing [and buf was NULL initially] */
|
|
free(buf);
|
|
return NULL;
|
|
}
|
|
break;
|
|
}
|
|
if (*p == '\n')
|
|
break;
|
|
p++;
|
|
}
|
|
*p++ = '\0';
|
|
return xrealloc(buf, p - buf);
|
|
}
|
|
|
|
ssize_t read_close(int fd, void *buf, size_t size)
|
|
{
|
|
/*int e;*/
|
|
size = full_read(fd, buf, size);
|
|
/*e = errno;*/
|
|
close(fd);
|
|
/*errno = e;*/
|
|
return size;
|
|
}
|
|
|
|
ssize_t open_read_close(const char *filename, void *buf, size_t size)
|
|
{
|
|
int fd = open(filename, O_RDONLY);
|
|
if (fd < 0)
|
|
return fd;
|
|
return read_close(fd, buf, size);
|
|
}
|
|
|
|
// Read (potentially big) files in one go. File size is estimated by
|
|
// lseek to end.
|
|
void *xmalloc_open_read_close(const char *filename, size_t *sizep)
|
|
{
|
|
char *buf;
|
|
size_t size = sizep ? *sizep : INT_MAX;
|
|
int fd;
|
|
off_t len;
|
|
|
|
fd = xopen(filename, O_RDONLY);
|
|
/* /proc/N/stat files report len 0 here */
|
|
/* In order to make such files readable, we add small const */
|
|
len = xlseek(fd, 0, SEEK_END) | 0x3ff; /* + up to 1k */
|
|
xlseek(fd, 0, SEEK_SET);
|
|
if (len < size)
|
|
size = len;
|
|
buf = xmalloc(size + 1);
|
|
size = read_close(fd, buf, size);
|
|
if ((ssize_t)size < 0)
|
|
bb_perror_msg_and_die("'%s'", filename);
|
|
xrealloc(buf, size + 1);
|
|
buf[size] = '\0';
|
|
if (sizep)
|
|
*sizep = size;
|
|
return buf;
|
|
}
|