Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mkinitrd-magellan/busybox/editors/sed.c

    Diff of /trunk/mkinitrd-magellan/busybox/editors/sed.c

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 991 by niro, Sun May 30 11:32:42 2010 UTC revision 992 by niro, Sun May 30 11:43:19 2010 UTC
    # Line 487  static const char *parse_cmd_args(sed_cm Line 487  static const char *parse_cmd_args(sed_cm
    487  static void add_cmd(const char *cmdstr)  static void add_cmd(const char *cmdstr)
    488  {  {
    489   sed_cmd_t *sed_cmd;   sed_cmd_t *sed_cmd;
    490   int temp;   unsigned len, n;
    491    
    492   /* Append this line to any unfinished line from last time. */   /* Append this line to any unfinished line from last time. */
    493   if (G.add_cmd_line) {   if (G.add_cmd_line) {
    # Line 496  static void add_cmd(const char *cmdstr) Line 496  static void add_cmd(const char *cmdstr)
    496   cmdstr = G.add_cmd_line = tp;   cmdstr = G.add_cmd_line = tp;
    497   }   }
    498    
    499   /* If this line ends with backslash, request next line. */   /* If this line ends with unescaped backslash, request next line. */
    500   temp = strlen(cmdstr);   n = len = strlen(cmdstr);
    501   if (temp && cmdstr[--temp] == '\\') {   while (n && cmdstr[n-1] == '\\')
    502     n--;
    503     if ((len - n) & 1) { /* if odd number of trailing backslashes */
    504   if (!G.add_cmd_line)   if (!G.add_cmd_line)
    505   G.add_cmd_line = xstrdup(cmdstr);   G.add_cmd_line = xstrdup(cmdstr);
    506   G.add_cmd_line[temp] = '\0';   G.add_cmd_line[len-1] = '\0';
    507   return;   return;
    508   }   }
    509    
    # Line 936  static void process_files(void) Line 938  static void process_files(void)
    938   /* Skip blocks of commands we didn't match */   /* Skip blocks of commands we didn't match */
    939   if (sed_cmd->cmd == '{') {   if (sed_cmd->cmd == '{') {
    940   if (sed_cmd->invert ? matched : !matched) {   if (sed_cmd->invert ? matched : !matched) {
    941   while (sed_cmd->cmd != '}') {   unsigned nest_cnt = 0;
    942     while (1) {
    943     if (sed_cmd->cmd == '{')
    944     nest_cnt++;
    945     if (sed_cmd->cmd == '}') {
    946     nest_cnt--;
    947     if (nest_cnt == 0)
    948     break;
    949     }
    950   sed_cmd = sed_cmd->next;   sed_cmd = sed_cmd->next;
    951   if (!sed_cmd)   if (!sed_cmd)
    952   bb_error_msg_and_die("unterminated {");   bb_error_msg_and_die("unterminated {");
    # Line 1031  static void process_files(void) Line 1041  static void process_files(void)
    1041   case 'c':   case 'c':
    1042   /* Only triggers on last line of a matching range. */   /* Only triggers on last line of a matching range. */
    1043   if (!sed_cmd->in_match)   if (!sed_cmd->in_match)
    1044   sed_puts(sed_cmd->string, NO_EOL_CHAR);   sed_puts(sed_cmd->string, '\n');
    1045   goto discard_line;   goto discard_line;
    1046    
    1047   /* Read file, append contents to output */   /* Read file, append contents to output */
    Legend:
    Removed from v.991  
    changed lines
      Added in v.992