* The "ed" built-in command (much simplified)
*/
-#include "libbb.h"
+//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.
-enum {
- USERSIZE = sizeof(bb_common_bufsiz1) > 1024 ? 1024
- : sizeof(bb_common_bufsiz1) - 1, /* max line length typed in by user */
- INITBUF_SIZE = 1024, /* initial buffer size */
-};
+//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 {
struct LINE *next;
char data[1];
} LINE;
+
#define searchString bb_common_bufsiz1
-static LINE lines, *curLine;
-static int curNum, lastNum, marks[26], dirty;
-static char *bufBase, *bufPtr, *fileName;
-static int bufUsed, bufSize;
+enum {
+ USERSIZE = COMMON_BUFSIZE > 1024 ? 1024
+ : COMMON_BUFSIZE - 1, /* max line length typed in by user */
+ INITBUF_SIZE = 1024, /* initial buffer size */
+};
+
+struct globals {
+ int curNum;
+ int lastNum;
+ int bufUsed;
+ int bufSize;
+ LINE *curLine;
+ char *bufBase;
+ char *bufPtr;
+ char *fileName;
+ LINE lines;
+ smallint dirty;
+ int marks[26];
+};
+#define G (*ptr_to_globals)
+#define curLine (G.curLine )
+#define bufBase (G.bufBase )
+#define bufPtr (G.bufPtr )
+#define fileName (G.fileName )
+#define curNum (G.curNum )
+#define lastNum (G.lastNum )
+#define bufUsed (G.bufUsed )
+#define bufSize (G.bufSize )
+#define dirty (G.dirty )
+#define lines (G.lines )
+#define marks (G.marks )
+#define INIT_G() do { \
+ setup_common_bufsiz(); \
+ SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+} while (0)
+
static void doCommands(void);
static void subCommand(const char *cmd, int num1, int num2);
-static int getNum(const char **retcp, int *retHaveNum, int *retNum);
+static int getNum(const char **retcp, smallint *retHaveNum, int *retNum);
static int setCurNum(int num);
-static int initEdit(void);
-static void termEdit(void);
static void addLines(int num);
static int insertLine(int num, const char *data, int len);
-static int deleteLines(int num1, int num2);
+static void deleteLines(int num1, int num2);
static int printLines(int num1, int num2, int expandFlag);
static int writeLines(const char *file, int num1, int num2);
static int readLines(const char *file, int num);
static int searchLines(const char *str, int num1, int num2);
static LINE *findLine(int num);
-
static int findString(const LINE *lp, const char * str, int len, int offset);
-int ed_main(int argc, char **argv);
-int ed_main(int argc, char **argv)
+
+static int bad_nums(int num1, int num2, const char *for_what)
{
- if (!initEdit())
- return EXIT_FAILURE;
+ if ((num1 < 1) || (num2 > lastNum) || (num1 > num2)) {
+ bb_error_msg("bad line range for %s", for_what);
+ return 1;
+ }
+ return 0;
+}
- if (argc > 1) {
- fileName = strdup(argv[1]);
- if (fileName == NULL) {
- bb_error_msg("no memory");
- termEdit();
- return EXIT_SUCCESS;
- }
+static char *skip_blank(const char *cp)
+{
+ while (isblank(*cp))
+ cp++;
+ return (char *)cp;
+}
+
+
+int ed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ed_main(int argc UNUSED_PARAM, char **argv)
+{
+ INIT_G();
+ bufSize = INITBUF_SIZE;
+ bufBase = xmalloc(bufSize);
+ bufPtr = bufBase;
+ lines.next = &lines;
+ lines.prev = &lines;
+
+ if (argv[1]) {
+ fileName = xstrdup(argv[1]);
if (!readLines(fileName, 1)) {
- termEdit();
return EXIT_SUCCESS;
}
-
if (lastNum)
setCurNum(1);
-
dirty = FALSE;
}
doCommands();
-
- termEdit();
return EXIT_SUCCESS;
}
static void doCommands(void)
{
const char *cp;
- char *endbuf, *newname, buf[USERSIZE];
- int len, num1, num2, have1, have2;
+ char *endbuf, buf[USERSIZE];
+ int len, num1, num2;
+ smallint have1, have2;
while (TRUE) {
- printf(": ");
- fflush(stdout);
-
- if (fgets(buf, sizeof(buf), stdin) == NULL)
- return;
-
- len = strlen(buf);
-
- if (len == 0)
+ /* Returns:
+ * -1 on read errors or EOF, or on bare Ctrl-D.
+ * 0 on ctrl-C,
+ * >0 length of input string, including terminating '\n'
+ */
+ len = read_line_input(NULL, ": ", buf, sizeof(buf), /*timeout*/ -1);
+ if (len <= 0)
return;
-
endbuf = &buf[len - 1];
-
- if (*endbuf != '\n') {
- bb_error_msg("command line too long");
-
- do {
- len = fgetc(stdin);
- } while ((len != EOF) && (len != '\n'));
-
- continue;
- }
-
while ((endbuf > buf) && isblank(endbuf[-1]))
endbuf--;
-
*endbuf = '\0';
- cp = buf;
-
- while (isblank(*cp))
- cp++;
-
+ cp = skip_blank(buf);
have1 = FALSE;
have2 = FALSE;
if (!getNum(&cp, &have1, &num1))
continue;
- while (isblank(*cp))
- cp++;
+ cp = skip_blank(cp);
if (*cp == ',') {
cp++;
-
if (!getNum(&cp, &have2, &num2))
continue;
-
if (!have1)
num1 = 1;
-
if (!have2)
num2 = lastNum;
-
have1 = TRUE;
have2 = TRUE;
}
-
if (!have1)
num1 = curNum;
-
if (!have2)
num2 = num1;
switch (*cp++) {
- case 'a':
- addLines(num1 + 1);
- break;
-
- case 'c':
- deleteLines(num1, num2);
- addLines(num1);
- break;
-
- case 'd':
- deleteLines(num1, num2);
- break;
-
- case 'f':
- if (*cp && !isblank(*cp)) {
- bb_error_msg("bad file command");
- break;
- }
-
- while (isblank(*cp))
- cp++;
-
- if (*cp == '\0') {
- if (fileName)
- printf("\"%s\"\n", fileName);
- else
- printf("No file name\n");
- break;
- }
+ case 'a':
+ addLines(num1 + 1);
+ break;
- newname = strdup(cp);
+ case 'c':
+ deleteLines(num1, num2);
+ addLines(num1);
+ break;
- if (newname == NULL) {
- bb_error_msg("no memory for file name");
- break;
- }
+ case 'd':
+ deleteLines(num1, num2);
+ break;
+ case 'f':
+ if (*cp && !isblank(*cp)) {
+ bb_error_msg("bad file command");
+ break;
+ }
+ cp = skip_blank(cp);
+ if (*cp == '\0') {
if (fileName)
- free(fileName);
-
- fileName = newname;
+ printf("\"%s\"\n", fileName);
+ else
+ puts("No file name");
break;
+ }
+ free(fileName);
+ fileName = xstrdup(cp);
+ break;
+
+ case 'i':
+ addLines(num1);
+ break;
- case 'i':
- addLines(num1);
+ case 'k':
+ cp = skip_blank(cp);
+ if ((*cp < 'a') || (*cp > 'z') || cp[1]) {
+ bb_error_msg("bad mark name");
break;
+ }
+ marks[*cp - 'a'] = num2;
+ break;
- case 'k':
- while (isblank(*cp))
- cp++;
+ case 'l':
+ printLines(num1, num2, TRUE);
+ break;
- if ((*cp < 'a') || (*cp > 'a') || cp[1]) {
- bb_error_msg("bad mark name");
- break;
- }
+ case 'p':
+ printLines(num1, num2, FALSE);
+ break;
- marks[*cp - 'a'] = num2;
+ case 'q':
+ cp = skip_blank(cp);
+ if (have1 || *cp) {
+ bb_error_msg("bad quit command");
break;
+ }
+ if (!dirty)
+ return;
+ len = read_line_input(NULL, "Really quit? ", buf, 16, /*timeout*/ -1);
+ /* read error/EOF - no way to continue */
+ if (len < 0)
+ return;
+ cp = skip_blank(buf);
+ if ((*cp | 0x20) == 'y') /* Y or y */
+ return;
+ break;
- case 'l':
- printLines(num1, num2, TRUE);
+ case 'r':
+ if (*cp && !isblank(*cp)) {
+ bb_error_msg("bad read command");
break;
-
- case 'p':
- printLines(num1, num2, FALSE);
+ }
+ cp = skip_blank(cp);
+ if (*cp == '\0') {
+ bb_error_msg("no file name");
break;
-
- case 'q':
- while (isblank(*cp))
- cp++;
-
- if (have1 || *cp) {
- bb_error_msg("bad quit command");
- break;
- }
-
- if (!dirty)
- return;
-
- printf("Really quit? ");
- fflush(stdout);
-
- buf[0] = '\0';
- fgets(buf, sizeof(buf), stdin);
- cp = buf;
-
- while (isblank(*cp))
- cp++;
-
- if ((*cp == 'y') || (*cp == 'Y'))
- return;
-
+ }
+ if (!have1)
+ num1 = lastNum;
+ if (readLines(cp, num1 + 1))
break;
+ if (fileName == NULL)
+ fileName = xstrdup(cp);
+ break;
- case 'r':
- if (*cp && !isblank(*cp)) {
- bb_error_msg("bad read command");
- break;
- }
-
- while (isblank(*cp))
- cp++;
-
- if (*cp == '\0') {
- bb_error_msg("no file name");
- break;
- }
-
- if (!have1)
- num1 = lastNum;
-
- if (readLines(cp, num1 + 1))
- break;
-
- if (fileName == NULL)
- fileName = strdup(cp);
-
- break;
+ case 's':
+ subCommand(cp, num1, num2);
+ break;
- case 's':
- subCommand(cp, num1, num2);
+ case 'w':
+ if (*cp && !isblank(*cp)) {
+ bb_error_msg("bad write command");
break;
-
- case 'w':
- if (*cp && !isblank(*cp)) {
- bb_error_msg("bad write command");
- break;
- }
-
- while (isblank(*cp))
- cp++;
-
- if (!have1) {
- num1 = 1;
- num2 = lastNum;
- }
-
- if (*cp == '\0')
- cp = fileName;
-
- if (cp == NULL) {
- bb_error_msg("no file name specified");
- break;
- }
-
- writeLines(cp, num1, num2);
+ }
+ cp = skip_blank(cp);
+ if (!have1) {
+ num1 = 1;
+ num2 = lastNum;
+ }
+ if (*cp == '\0')
+ cp = fileName;
+ if (cp == NULL) {
+ bb_error_msg("no file name specified");
break;
+ }
+ writeLines(cp, num1, num2);
+ break;
- case 'z':
- switch (*cp) {
- case '-':
- printLines(curNum-21, curNum, FALSE);
- break;
- case '.':
- printLines(curNum-11, curNum+10, FALSE);
- break;
- default:
- printLines(curNum, curNum+21, FALSE);
- break;
- }
+ case 'z':
+ switch (*cp) {
+ case '-':
+ printLines(curNum - 21, curNum, FALSE);
break;
-
case '.':
- if (have1) {
- bb_error_msg("no arguments allowed");
- break;
- }
-
- printLines(curNum, curNum, FALSE);
+ printLines(curNum - 11, curNum + 10, FALSE);
break;
-
- case '-':
- if (setCurNum(curNum - 1))
- printLines(curNum, curNum, FALSE);
-
+ default:
+ printLines(curNum, curNum + 21, FALSE);
break;
+ }
+ break;
- case '=':
- printf("%d\n", num1);
+ case '.':
+ if (have1) {
+ bb_error_msg("no arguments allowed");
break;
+ }
+ printLines(curNum, curNum, FALSE);
+ break;
- case '\0':
- if (have1) {
- printLines(num2, num2, FALSE);
- break;
- }
-
- if (setCurNum(curNum + 1))
- printLines(curNum, curNum, FALSE);
+ case '-':
+ if (setCurNum(curNum - 1))
+ printLines(curNum, curNum, FALSE);
+ break;
+ case '=':
+ printf("%d\n", num1);
+ break;
+ case '\0':
+ if (have1) {
+ printLines(num2, num2, FALSE);
break;
+ }
+ if (setCurNum(curNum + 1))
+ printLines(curNum, curNum, FALSE);
+ break;
- default:
- bb_error_msg("unimplemented command");
- break;
+ default:
+ bb_error_msg("unimplemented command");
+ break;
}
}
}
* Do the substitute command.
* The current line is set to the last substitution done.
*/
-static void subCommand(const char * cmd, int num1, int num2)
+static void subCommand(const char *cmd, int num1, int num2)
{
char *cp, *oldStr, *newStr, buf[USERSIZE];
int delim, oldLen, newLen, deltaLen, offset;
LINE *lp, *nlp;
int globalFlag, printFlag, didSub, needPrint;
- if ((num1 < 1) || (num2 > lastNum) || (num1 > num2)) {
- bb_error_msg("bad line range for substitute");
+ if (bad_nums(num1, num2, "substitute"))
return;
- }
globalFlag = FALSE;
printFlag = FALSE;
oldStr = cp;
cp = strchr(cp, delim);
-
if (cp == NULL) {
bb_error_msg("missing 2nd delimiter for substitute");
return;
case 'g':
globalFlag = TRUE;
break;
-
case 'p':
printFlag = TRUE;
break;
-
default:
bb_error_msg("unknown option for substitute");
return;
bb_error_msg("no previous search string");
return;
}
-
oldStr = searchString;
}
strcpy(searchString, oldStr);
lp = findLine(num1);
-
if (lp == NULL)
return;
printLines(num1, num1, FALSE);
needPrint = FALSE;
}
-
offset = 0;
lp = lp->next;
num1++;
-
continue;
}
*/
if (deltaLen <= 0) {
memcpy(&lp->data[offset], newStr, newLen);
-
if (deltaLen) {
memcpy(&lp->data[offset + newLen],
&lp->data[offset + oldLen],
lp->len += deltaLen;
}
-
offset += newLen;
-
if (globalFlag)
continue;
-
if (needPrint) {
printLines(num1, num1, FALSE);
needPrint = FALSE;
}
-
lp = lp->next;
num1++;
-
continue;
}
/*
* The new string is larger, so allocate a new line
- * structure and use that. Link it in in place of
+ * structure and use that. Link it in place of
* the old line structure.
*/
- nlp = (LINE *) malloc(sizeof(LINE) + lp->len + deltaLen);
-
- if (nlp == NULL) {
- bb_error_msg("cannot get memory for line");
- return;
- }
+ nlp = xmalloc(sizeof(LINE) + lp->len + deltaLen);
nlp->len = lp->len + deltaLen;
memcpy(nlp->data, lp->data, offset);
-
memcpy(&nlp->data[offset], newStr, newLen);
-
memcpy(&nlp->data[offset + newLen],
&lp->data[offset + oldLen],
lp->len - offset - oldLen);
* Search a line for the specified string starting at the specified
* offset in the line. Returns the offset of the found string, or -1.
*/
-static int findString( const LINE * lp, const char * str, int len, int offset)
+static int findString(const LINE *lp, const char *str, int len, int offset)
{
int left;
const char *cp, *ncp;
while (left >= len) {
ncp = memchr(cp, *str, left);
-
if (ncp == NULL)
return -1;
-
left -= (ncp - cp);
-
if (left < len)
return -1;
-
cp = ncp;
-
if (memcmp(cp, str, len) == 0)
return (cp - lp->data);
-
cp++;
left--;
}
int len;
char buf[USERSIZE + 1];
- while (fgets(buf, sizeof(buf), stdin)) {
- if ((buf[0] == '.') && (buf[1] == '\n') && (buf[2] == '\0'))
- return;
-
- len = strlen(buf);
-
- if (len == 0)
- return;
-
- if (buf[len - 1] != '\n') {
- bb_error_msg("line too long");
- do {
- len = fgetc(stdin);
- } while ((len != EOF) && (len != '\n'));
+ while (1) {
+ /* Returns:
+ * -1 on read errors or EOF, or on bare Ctrl-D.
+ * 0 on ctrl-C,
+ * >0 length of input string, including terminating '\n'
+ */
+ len = read_line_input(NULL, "", buf, sizeof(buf), /*timeout*/ -1);
+ if (len <= 0) {
+ /* Previously, ctrl-C was exiting to shell.
+ * Now we exit to ed prompt. Is in important? */
return;
}
-
+ if ((buf[0] == '.') && (buf[1] == '\n') && (buf[2] == '\0'))
+ return;
if (!insertLine(num++, buf, len))
return;
}
* Whether there was a number is returned indirectly, as is the number.
* The character pointer which stopped the scan is also returned.
*/
-static int getNum(const char **retcp, int *retHaveNum, int *retNum)
+static int getNum(const char **retcp, smallint *retHaveNum, int *retNum)
{
const char *cp;
char *endStr, str[USERSIZE];
- int haveNum, value, num, sign;
+ int value, num;
+ smallint haveNum, minus;
cp = *retcp;
- haveNum = FALSE;
value = 0;
- sign = 1;
+ haveNum = FALSE;
+ minus = 0;
while (TRUE) {
- while (isblank(*cp))
- cp++;
+ cp = skip_blank(cp);
switch (*cp) {
case '.':
case '\'':
cp++;
-
if ((*cp < 'a') || (*cp > 'z')) {
bb_error_msg("bad mark name");
return FALSE;
}
-
haveNum = TRUE;
num = marks[*cp++ - 'a'];
break;
case '/':
strcpy(str, ++cp);
endStr = strchr(str, '/');
-
if (endStr) {
*endStr++ = '\0';
cp += (endStr - str);
- }
- else
+ } else
cp = "";
-
num = searchLines(str, curNum, lastNum);
-
if (num == 0)
return FALSE;
-
haveNum = TRUE;
break;
*retNum = value;
return TRUE;
}
-
num = 0;
-
while (isdigit(*cp))
num = num * 10 + *cp++ - '0';
-
haveNum = TRUE;
break;
}
- value += num * sign;
+ value += (minus ? -num : num);
- while (isblank(*cp))
- cp++;
+ cp = skip_blank(cp);
switch (*cp) {
case '-':
- sign = -1;
+ minus = 1;
cp++;
break;
case '+':
- sign = 1;
+ minus = 0;
cp++;
break;
}
-/*
- * Initialize everything for editing.
- */
-static int initEdit(void)
-{
- int i;
-
- bufSize = INITBUF_SIZE;
- bufBase = malloc(bufSize);
-
- if (bufBase == NULL) {
- bb_error_msg("no memory for buffer");
- return FALSE;
- }
-
- bufPtr = bufBase;
- bufUsed = 0;
-
- lines.next = &lines;
- lines.prev = &lines;
-
- curLine = NULL;
- curNum = 0;
- lastNum = 0;
- dirty = FALSE;
- fileName = NULL;
- searchString[0] = '\0';
-
- for (i = 0; i < 26; i++)
- marks[i] = 0;
-
- return TRUE;
-}
-
-
-/*
- * Finish editing.
- */
-static void termEdit(void)
-{
- if (bufBase)
- free(bufBase);
-
- bufBase = NULL;
- bufPtr = NULL;
- bufSize = 0;
- bufUsed = 0;
-
- if (fileName)
- free(fileName);
-
- fileName = NULL;
-
- searchString[0] = '\0';
-
- if (lastNum)
- deleteLines(1, lastNum);
-
- lastNum = 0;
- curNum = 0;
- curLine = NULL;
-}
-
-
/*
* Read lines from a file at the specified line number.
* Returns TRUE if the file was successfully read.
*/
-static int readLines(const char * file, int num)
+static int readLines(const char *file, int num)
{
int fd, cc;
int len, lineCount, charCount;
}
fd = open(file, 0);
-
if (fd < 0) {
- perror(file);
+ bb_simple_perror_msg(file);
return FALSE;
}
cc = 0;
printf("\"%s\", ", file);
- fflush(stdout);
+ fflush_all();
do {
cp = memchr(bufPtr, '\n', bufUsed);
if (cp) {
len = (cp - bufPtr) + 1;
-
if (!insertLine(num, bufPtr, len)) {
close(fd);
return FALSE;
}
-
bufPtr += len;
bufUsed -= len;
charCount += len;
lineCount++;
num++;
-
continue;
}
if (bufUsed >= bufSize) {
len = (bufSize * 3) / 2;
- cp = realloc(bufBase, len);
-
- if (cp == NULL) {
- bb_error_msg("no memory for buffer");
- close(fd);
- return FALSE;
- }
-
+ cp = xrealloc(bufBase, len);
bufBase = cp;
bufPtr = bufBase + bufUsed;
bufSize = len;
}
- cc = read(fd, bufPtr, bufSize - bufUsed);
+ cc = safe_read(fd, bufPtr, bufSize - bufUsed);
bufUsed += cc;
bufPtr = bufBase;
-
} while (cc > 0);
if (cc < 0) {
- perror(file);
+ bb_simple_perror_msg(file);
close(fd);
return FALSE;
}
close(fd);
return -1;
}
-
lineCount++;
charCount += bufUsed;
}
* Write the specified lines out to the specified file.
* Returns TRUE if successful, or FALSE on an error with a message output.
*/
-static int writeLines(const char * file, int num1, int num2)
+static int writeLines(const char *file, int num1, int num2)
{
LINE *lp;
int fd, lineCount, charCount;
- if ((num1 < 1) || (num2 > lastNum) || (num1 > num2)) {
- bb_error_msg("bad line range for write");
+ if (bad_nums(num1, num2, "write"))
return FALSE;
- }
lineCount = 0;
charCount = 0;
fd = creat(file, 0666);
-
if (fd < 0) {
- perror(file);
+ bb_simple_perror_msg(file);
return FALSE;
}
printf("\"%s\", ", file);
- fflush(stdout);
+ fflush_all();
lp = findLine(num1);
-
if (lp == NULL) {
close(fd);
return FALSE;
}
while (num1++ <= num2) {
- if (write(fd, lp->data, lp->len) != lp->len) {
- perror(file);
+ if (full_write(fd, lp->data, lp->len) != lp->len) {
+ bb_simple_perror_msg(file);
close(fd);
return FALSE;
}
-
charCount += lp->len;
lineCount++;
lp = lp->next;
}
if (close(fd) < 0) {
- perror(file);
+ bb_simple_perror_msg(file);
return FALSE;
}
const char *cp;
int ch, count;
- if ((num1 < 1) || (num2 > lastNum) || (num1 > num2)) {
- bb_error_msg("bad line range for print");
+ if (bad_nums(num1, num2, "print"))
return FALSE;
- }
lp = findLine(num1);
-
if (lp == NULL)
return FALSE;
while (num1 <= num2) {
if (!expandFlag) {
- write(1, lp->data, lp->len);
+ write(STDOUT_FILENO, lp->data, lp->len);
setCurNum(num1++);
lp = lp->next;
-
continue;
}
count--;
while (count-- > 0) {
- ch = *cp++;
-
- if (ch & 0x80) {
- fputs("M-", stdout);
- ch &= 0x7f;
- }
-
- if (ch < ' ') {
- fputc('^', stdout);
- ch += '@';
- }
-
- if (ch == 0x7f) {
- fputc('^', stdout);
- ch = '?';
- }
-
- fputc(ch, stdout);
+ ch = (unsigned char) *cp++;
+ fputc_printable(ch | PRINTABLE_META, stdout);
}
fputs("$\n", stdout);
* The inserted line is also set to become the current line.
* Returns TRUE if successful.
*/
-static int insertLine(int num, const char * data, int len)
+static int insertLine(int num, const char *data, int len)
{
LINE *newLp, *lp;
return FALSE;
}
- newLp = malloc(sizeof(LINE) + len - 1);
-
- if (newLp == NULL) {
- bb_error_msg("failed to allocate memory for line");
- return FALSE;
- }
+ newLp = xmalloc(sizeof(LINE) + len - 1);
memcpy(newLp->data, data, len);
newLp->len = len;
lp = &lines;
else {
lp = findLine(num);
-
if (lp == NULL) {
free((char *) newLp);
return FALSE;
/*
* Delete lines from the given range.
*/
-static int deleteLines(int num1, int num2)
+static void deleteLines(int num1, int num2)
{
LINE *lp, *nlp, *plp;
int count;
- if ((num1 < 1) || (num2 > lastNum) || (num1 > num2)) {
- bb_error_msg("bad line numbers for delete");
- return FALSE;
- }
+ if (bad_nums(num1, num2, "delete"))
+ return;
lp = findLine(num1);
-
if (lp == NULL)
- return FALSE;
+ return;
if ((curNum >= num1) && (curNum <= num2)) {
if (num2 < lastNum)
}
count = num2 - num1 + 1;
-
if (curNum > num2)
curNum -= count;
-
lastNum -= count;
while (count-- > 0) {
plp = lp->prev;
plp->next = nlp;
nlp->prev = plp;
- lp->next = NULL;
- lp->prev = NULL;
- lp->len = 0;
free(lp);
lp = nlp;
}
dirty = TRUE;
-
- return TRUE;
}
/*
* Search for a line which contains the specified string.
- * If the string is NULL, then the previously searched for string
+ * If the string is "", then the previously searched for string
* is used. The currently searched for string is saved for future use.
* Returns the line number which matches, or 0 if there was no match
* with an error printed.
*/
-static int searchLines(const char *str, int num1, int num2)
+static NOINLINE int searchLines(const char *str, int num1, int num2)
{
const LINE *lp;
int len;
- if ((num1 < 1) || (num2 > lastNum) || (num1 > num2)) {
- bb_error_msg("bad line numbers for search");
+ if (bad_nums(num1, num2, "search"))
return 0;
- }
if (*str == '\0') {
if (searchString[0] == '\0') {
bb_error_msg("no previous search string");
return 0;
}
-
str = searchString;
}
len = strlen(str);
lp = findLine(num1);
-
if (lp == NULL)
return 0;
while (num1 <= num2) {
if (findString(lp, str, len, 0) >= 0)
return num1;
-
num1++;
lp = lp->next;
}
- bb_error_msg("cannot find string \"%s\"", str);
+ bb_error_msg("can't find string \"%s\"", str);
return 0;
}
lp = curLine;
lnum = curNum;
-
if (num < (curNum / 2)) {
lp = lines.next;
lnum = 1;
- }
- else if (num > ((curNum + lastNum) / 2)) {
+ } else if (num > ((curNum + lastNum) / 2)) {
lp = lines.prev;
lnum = lastNum;
}
LINE *lp;
lp = findLine(num);
-
if (lp == NULL)
return FALSE;
-
curNum = num;
curLine = lp;
return TRUE;
projects / oweals / busybox.git / blobdiff