aboutsummaryrefslogtreecommitdiff
path: root/libbb/read.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-07-08 05:14:36 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-07-08 05:14:36 +0000
commitdeeed59de0a9bcc068ebd14d7496a6b26e45b890 (patch)
tree7dafd469e9f6bca107adbf930fe77fff9958a0b6 /libbb/read.c
parent493829207c1c2a36d55aaa13abf806533d0cb87f (diff)
downloadbusybox-w32-deeed59de0a9bcc068ebd14d7496a6b26e45b890.tar.gz
busybox-w32-deeed59de0a9bcc068ebd14d7496a6b26e45b890.tar.bz2
busybox-w32-deeed59de0a9bcc068ebd14d7496a6b26e45b890.zip
libbb: introduce and use xrealloc_vector
function old new delta xrealloc_vector_helper - 51 +51 create_list 84 99 +15 getopt_main 690 695 +5 passwd_main 1049 1053 +4 get_cached 85 89 +4 msh_main 1377 1380 +3 add_match 42 41 -1 read_lines 720 718 -2 grave 1068 1066 -2 fill_match_lines 143 141 -2 add_to_dirlist 67 65 -2 add_input_file 49 47 -2 act 252 250 -2 fsck_main 2252 2246 -6 man_main 765 757 -8 bb_internal_initgroups 228 220 -8 cut_main 1052 1041 -11 add_edge_to_node 55 43 -12 dpkg_main 3851 3835 -16 ifupdown_main 2202 2178 -24 sort_main 838 812 -26 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 5/15 up/down: 82/-124) Total: -42 bytes
Diffstat (limited to 'libbb/read.c')
-rw-r--r--libbb/read.c49
1 files changed, 49 insertions, 0 deletions
diff --git a/libbb/read.c b/libbb/read.c
index 7b804125a..405e216dc 100644
--- a/libbb/read.c
+++ b/libbb/read.c
@@ -291,3 +291,52 @@ void* FAST_FUNC xmalloc_xopen_read_close(const char *filename, size_t *sizep)
291 bb_perror_msg_and_die("can't read '%s'", filename); 291 bb_perror_msg_and_die("can't read '%s'", filename);
292 return buf; 292 return buf;
293} 293}
294
295/* libbb candidate */
296#if 0
297static void *xmalloc_read(int fd, size_t *sizep)
298{
299 char *buf;
300 size_t size, rd_size, total;
301 off_t to_read;
302 struct stat st;
303
304 to_read = sizep ? *sizep : INT_MAX; /* max to read */
305
306 /* Estimate file size */
307 st.st_size = 0; /* in case fstat fails, assume 0 */
308 fstat(fd, &st);
309 /* /proc/N/stat files report st_size 0 */
310 /* In order to make such files readable, we add small const */
311 size = (st.st_size | 0x3ff) + 1;
312
313 total = 0;
314 buf = NULL;
315 while (1) {
316 if (to_read < size)
317 size = to_read;
318 buf = xrealloc(buf, total + size + 1);
319 rd_size = full_read(fd, buf + total, size);
320 if ((ssize_t)rd_size < 0) { /* error */
321 free(buf);
322 return NULL;
323 }
324 total += rd_size;
325 if (rd_size < size) /* EOF */
326 break;
327 to_read -= rd_size;
328 if (to_read <= 0)
329 break;
330 /* grow by 1/8, but in [1k..64k] bounds */
331 size = ((total / 8) | 0x3ff) + 1;
332 if (size > 64*1024)
333 size = 64*1024;
334 }
335 xrealloc(buf, total + 1);
336 buf[total] = '\0';
337
338 if (sizep)
339 *sizep = total;
340 return buf;
341}
342#endif