aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-04-21 18:38:51 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2016-04-21 18:38:51 +0200
commit9de2e5a22213842da5b116723392de88de9ed419 (patch)
treedff999a566382174e084d377dc3b4c03de1d4c62 /editors
parent47cfbf32fd66563f8c4e09ad6cced6abfbe2fad5 (diff)
downloadbusybox-w32-9de2e5a22213842da5b116723392de88de9ed419.tar.gz
busybox-w32-9de2e5a22213842da5b116723392de88de9ed419.tar.bz2
busybox-w32-9de2e5a22213842da5b116723392de88de9ed419.zip
*: hopefully all setup_common_bufsiz() are in place
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'editors')
-rw-r--r--editors/diff.c1
-rw-r--r--editors/ed.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/editors/diff.c b/editors/diff.c
index 3c8e9074a..ff269360f 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -749,6 +749,7 @@ static int diffreg(char *file[2])
749 fp[i] = fdopen(fd, "r"); 749 fp[i] = fdopen(fd, "r");
750 } 750 }
751 751
752 setup_common_bufsiz();
752 while (1) { 753 while (1) {
753 const size_t sz = COMMON_BUFSIZE / 2; 754 const size_t sz = COMMON_BUFSIZE / 2;
754 char *const buf0 = bb_common_bufsiz1; 755 char *const buf0 = bb_common_bufsiz1;
diff --git a/editors/ed.c b/editors/ed.c
index 8da7b1dd5..c028b78cb 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -33,12 +33,11 @@ typedef struct LINE {
33} LINE; 33} LINE;
34 34
35 35
36#define searchString bb_common_bufsiz1 36#define searchString bb_common_bufsiz1
37#define sizeof_searchString COMMON_BUFSIZE
38 37
39enum { 38enum {
40 USERSIZE = sizeof_searchString > 1024 ? 1024 39 USERSIZE = COMMON_BUFSIZE > 1024 ? 1024
41 : sizeof_searchString - 1, /* max line length typed in by user */ 40 : COMMON_BUFSIZE - 1, /* max line length typed in by user */
42 INITBUF_SIZE = 1024, /* initial buffer size */ 41 INITBUF_SIZE = 1024, /* initial buffer size */
43}; 42};
44 43
@@ -68,6 +67,7 @@ struct globals {
68#define lines (G.lines ) 67#define lines (G.lines )
69#define marks (G.marks ) 68#define marks (G.marks )
70#define INIT_G() do { \ 69#define INIT_G() do { \
70 setup_common_bufsiz(); \
71 SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ 71 SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
72} while (0) 72} while (0)
73 73