Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/editors/ed.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/editors/ed.c (modified) (5 diffs)

branches/3.3/mindi-busybox/editors/ed.c

@@ -8 +8 @@
  */
 
+//config:config ED
+//config:   bool "ed"
+//config:   default y
+//config:   help
+//config:     The original 1970's Unix text editor, from the days of teletypes.
+//config:     Small, simple, evil. Part of SUSv3. If you're not already using
+//config:     this, you don't need it.
+
+//kbuild:lib-$(CONFIG_ED) += ed.o
+
+//applet:IF_ED(APPLET(ed, BB_DIR_BIN, BB_SUID_DROP))
+
 //usage:#define ed_trivial_usage ""
 //usage:#define ed_full_usage ""
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 typedef struct LINE {
@@ -24 +37 @@
 
 enum {
-    USERSIZE = sizeof(searchString) > 1024 ? 1024
-             : sizeof(searchString) - 1, /* max line length typed in by user */
+    USERSIZE = COMMON_BUFSIZE > 1024 ? 1024
+             : COMMON_BUFSIZE - 1, /* max line length typed in by user */
     INITBUF_SIZE = 1024, /* initial buffer size */
 };
@@ -55 +68 @@
 #define marks              (G.marks             )
 #define INIT_G() do { \
+    setup_common_bufsiz(); \
     SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
 } while (0)
@@ -195 +209 @@
                     printf("\"%s\"\n", fileName);
                 else
-                    printf("No file name\n");
+                    puts("No file name");
                 break;
             }
@@ -721 +735 @@
         bufUsed += cc;
         bufPtr = bufBase;
-
     } while (cc > 0);