Ticket #38091: patch-yosemite-panic-rename.diff

File patch-yosemite-panic-rename.diff, 21.2 KB (added by jerryyhom, 6 years ago)
  • alpine/adrbkcmd.c

    diff -ur alpine-2.11/alpine/adrbkcmd.c patched/alpine/adrbkcmd.c
    old new  
    530530        break;
    531531
    532532      default:
    533         panic("Unexpected command in process_abook_view_cmd");
     533        uw_panic("Unexpected command in process_abook_view_cmd");
    534534        break;
    535535    }
    536536
     
    26392639    }
    26402640
    26412641    if(!ps->prc)
    2642       panic("NULL prc in convert_to_remote_config");
     2642      uw_panic("NULL prc in convert_to_remote_config");
    26432643
    26442644    dprint((2, "convert_to_remote_config\n"));
    26452645   
     
    50195019            break;
    50205020         
    50215021          default:
    5022             panic("can't happen in write_single_vcard_entry");
     5022            uw_panic("can't happen in write_single_vcard_entry");
    50235023        }
    50245024
    50255025        for(; ll && *ll; ll++){
     
    51525152            break;
    51535153
    51545154          default:
    5155             panic("can't happen in write_single_tab_entry");
     5155            uw_panic("can't happen in write_single_tab_entry");
    51565156        }
    51575157
    51585158        if(i)
     
    73747374        break;
    73757375
    73767376      default:
    7377         panic("Unexpected command in process_ldap_cmd");
     7377        uw_panic("Unexpected command in process_ldap_cmd");
    73787378        break;
    73797379    }
    73807380
  • alpine/alpine.c

    diff -ur alpine-2.11/alpine/alpine.c patched/alpine/alpine.c
    old new  
    23542354        break;
    23552355
    23562356      default:
    2357         panic("Unexpected command in choose_setup_cmd");
     2357        uw_panic("Unexpected command in choose_setup_cmd");
    23582358        break;
    23592359    }
    23602360
     
    33583358  This is also called from imap routines and fs_get and fs_resize.
    33593359  ----*/
    33603360void
    3361 panic(char *message)
     3361uw_panic(char *message)
    33623362{
    33633363    char buf[256];
    33643364
  • alpine/confscroll.c

    diff -ur alpine-2.11/alpine/confscroll.c patched/alpine/confscroll.c
    old new  
    53335333        }
    53345334        else{
    53355335            if(reset_character_set_stuff(&err) == -1)
    5336               panic(err ? err : "trouble with Character-Set");
     5336              uw_panic(err ? err : "trouble with Character-Set");
    53375337            else if(err){
    53385338                q_status_message(SM_ORDER | SM_DING, 3, 5, err);
    53395339                fs_give((void **) &err);
     
    53495349        }
    53505350        else{
    53515351            if(reset_character_set_stuff(&err) == -1)
    5352               panic(err ? err : "trouble with Character-Set");
     5352              uw_panic(err ? err : "trouble with Character-Set");
    53535353            else if(err){
    53545354                q_status_message(SM_ORDER | SM_DING, 3, 5, err);
    53555355                fs_give((void **) &err);
  • alpine/folder.c

    diff -ur alpine-2.11/alpine/folder.c patched/alpine/folder.c
    old new  
    10241024                  strncat(servpart, "#news.", sizeof(servpart)-1-strlen(servpart));
    10251025            }
    10261026            else
    1027               panic("Unexpected invalid server");
     1027              uw_panic("Unexpected invalid server");
    10281028        }
    10291029        else
    10301030          servpart[0] = '\0';
  • alpine/help.c

    diff -ur alpine-2.11/alpine/help.c patched/alpine/help.c
    old new  
    431431        break;
    432432
    433433      default :
    434         panic("Unhandled case");
     434        uw_panic("Unhandled case");
    435435    }
    436436
    437437    return(rv);
     
    898898        break;
    899899
    900900      default:
    901         panic("Unexpected command in journal_processor");
     901        uw_panic("Unexpected command in journal_processor");
    902902        break;
    903903    }
    904904   
  • alpine/imap.c

    diff -ur alpine-2.11/alpine/imap.c patched/alpine/imap.c
    old new  
    18421842        break;
    18431843
    18441844      default:
    1845         panic("Unexpected command in answer_cert_failure");
     1845        uw_panic("Unexpected command in answer_cert_failure");
    18461846        break;
    18471847    }
    18481848
  • alpine/mailcmd.c

    diff -ur alpine-2.11/alpine/mailcmd.c patched/alpine/mailcmd.c
    old new  
    14791479
    14801480          /*--------- Default, unknown command ----------*/
    14811481      default:
    1482         panic("Unexpected command case");
     1482        uw_panic("Unexpected command case");
    14831483        break;
    14841484    }
    14851485
     
    26762676    RULE_RESULT      *rule;
    26772677
    26782678    if(!cntxt)
    2679       panic("no context ptr in save_prompt");
     2679      uw_panic("no context ptr in save_prompt");
    26802680
    26812681    init_hist(&history, HISTSIZE);
    26822682
     
    30683068            break;
    30693069
    30703070          default :
    3071             panic("Unhandled case");
     3071            uw_panic("Unhandled case");
    30723072            break;
    30733073        }
    30743074
     
    57135713            break;
    57145714
    57155715          default :
    5716             panic("Unhandled case");
     5716            uw_panic("Unhandled case");
    57175717            break;
    57185718        }
    57195719
  • alpine/mailpart.c

    diff -ur alpine-2.11/alpine/mailpart.c patched/alpine/mailpart.c
    old new  
    26312631        break;
    26322632
    26332633      default:
    2634         panic("Unexpected command case");
     2634        uw_panic("Unexpected command case");
    26352635        break;
    26362636    }
    26372637
  • alpine/mailview.c

    diff -ur alpine-2.11/alpine/mailview.c patched/alpine/mailview.c
    old new  
    10681068
    10691069
    10701070      default :
    1071         panic("Unexpected HANDLE type");
     1071        uw_panic("Unexpected HANDLE type");
    10721072    }
    10731073
    10741074    return(0);
     
    11711171        }
    11721172
    11731173        if(l == start_line)
    1174           panic("Internal Error: no handle found");
     1174          uw_panic("Internal Error: no handle found");
    11751175        else
    11761176          start_line = l;
    11771177    }
  • alpine/newuser.c

    diff -ur alpine-2.11/alpine/newuser.c patched/alpine/newuser.c
    old new  
    197197        break;
    198198
    199199      default :
    200         panic("Unhandled case");
     200        uw_panic("Unhandled case");
    201201    }
    202202
    203203    return(rv);
  • alpine/radio.c

    diff -ur alpine-2.11/alpine/radio.c patched/alpine/radio.c
    old new  
    280280
    281281        if(flags & RB_RET_HELP){
    282282            if(help_text != NO_HELP)
    283               panic("RET_HELP and help in radio_buttons!");
     283              uw_panic("RET_HELP and help in radio_buttons!");
    284284
    285285            button_list[b].ch = '?';
    286286            button_list[b].rval = 3;
     
    360360    clrbitmap(bitmap);
    361361    memset(fkey_table, NO_OP_COMMAND, 12 * sizeof(int));
    362362    if(flags & RB_RET_HELP && help_text != NO_HELP)
    363       panic("RET_HELP and help in radio_buttons!");
     363      uw_panic("RET_HELP and help in radio_buttons!");
    364364
    365365    /* if shown, always at position 0 */
    366366    if(help_text != NO_HELP || flags & RB_RET_HELP){
     
    398398               && esc_list[i-start].label[0] != '\0'){  /* visible */
    399399                if(i == 12){  /* special case where we put it in help slot */
    400400                    if(help_text != NO_HELP)
    401                   panic("Programming botch in radio_buttons(): too many keys");
     401                  uw_panic("Programming botch in radio_buttons(): too many keys");
    402402
    403403                    if(esc_list[i-start].ch != -2)
    404404                      setbitn(0, bitmap); /* the help slot */
     
    420420                      rb_keymenu.keys[0].label = esc_list[i-start].label;
    421421                }
    422422                else
    423                   panic("Botch in radio_buttons(): too many keys");
     423                  uw_panic("Botch in radio_buttons(): too many keys");
    424424            }
    425425        }
    426426        else{
     
    823823     */
    824824    for(i=0; list1 && list1[i].ch != -1; i++){
    825825        if(list1[i].rval == list[j].rval)
    826           panic("1bad rval in d_r");
     826          uw_panic("1bad rval in d_r");
    827827        if(F_OFF(F_USE_FK,ps_global) && list1[i].ch == list[j].ch)
    828           panic("1bad ch in ccl");
     828          uw_panic("1bad ch in ccl");
    829829    }
    830830
    831831    for(i=0; list2 && list2[i].ch != -1; i++){
    832832        if(list2[i].rval == list[j].rval)
    833           panic("2bad rval in d_r");
     833          uw_panic("2bad rval in d_r");
    834834        if(F_OFF(F_USE_FK,ps_global) && list2[i].ch == list[j].ch)
    835           panic("2bad ch in ccl");
     835          uw_panic("2bad ch in ccl");
    836836    }
    837837
    838838    j++;
     
    840840    /* the visible set */
    841841    for(i=0; list1 && list1[i].ch != -1; i++){
    842842        if(i >= KEYS_PER_LIST && list1[i].label[0] != '\0')
    843           panic("too many visible keys in ccl");
     843          uw_panic("too many visible keys in ccl");
    844844
    845845        list[j++] = list1[i];
    846846    }
  • alpine/remote.c

    diff -ur alpine-2.11/alpine/remote.c patched/alpine/remote.c
    old new  
    248248        break;
    249249
    250250      default:
    251         panic("Unexpected command in rd_answer_forge_warning");
     251        uw_panic("Unexpected command in rd_answer_forge_warning");
    252252        break;
    253253    }
    254254
  • alpine/roleconf.c

    diff -ur alpine-2.11/alpine/roleconf.c patched/alpine/roleconf.c
    old new  
    59355935    char ***alval;
    59365936
    59375937    if(!(v && name))
    5938       panic("setup_dummy_pattern_var");
     5938      uw_panic("setup_dummy_pattern_var");
    59395939
    59405940    v->name = (char *) fs_get(strlen(name)+NOTLEN+1);
    59415941    snprintf(v->name, strlen(name)+NOTLEN+1, "%s%s", (defpat && defpat->not) ? NOT : "", name);
  • alpine/signal.c

    diff -ur alpine-2.11/alpine/signal.c patched/alpine/signal.c
    old new  
    188188    snprintf(buf, sizeof(buf), "Received abort signal(sig=%d)", sig);
    189189    buf[sizeof(buf)-1] = '\0';
    190190
    191     panic(buf);                         /* clean up and get out */
     191    uw_panic(buf);                              /* clean up and get out */
    192192
    193193    exit(-1);                           /* in case panic doesn't kill us */
    194194}
  • pith/adrbklib.c

    diff -ur alpine-2.11/pith/adrbklib.c patched/pith/adrbklib.c
    old new  
    43434343
    43444344    nn = (adrbk_cntr_t)n;
    43454345    if(!exp_head)
    4346       panic("exp_head not set in exp_set_expanded");
     4346      uw_panic("exp_head not set in exp_set_expanded");
    43474347
    43484348    for(e = exp_head; e->next; e = e->next)
    43494349      if(e->next->ent >= nn)
     
    43754375
    43764376    nn = (adrbk_cntr_t)n;
    43774377    if(!exp_head)
    4378       panic("exp_head not set in exp_unset_expanded");
     4378      uw_panic("exp_head not set in exp_unset_expanded");
    43794379
    43804380    for(e = exp_head; e->next; e = e->next)
    43814381      if(e->next->ent >= nn)
     
    44074407
    44084408    nn = (adrbk_cntr_t)n;
    44094409    if(!exp_head)
    4410       panic("exp_head not set in exp_del_nth");
     4410      uw_panic("exp_head not set in exp_del_nth");
    44114411
    44124412    e = exp_head->next;
    44134413    while(e && e->ent < nn)
     
    44474447
    44484448    nn = (adrbk_cntr_t)n;
    44494449    if(!exp_head)
    4450       panic("exp_head not set in exp_add_nth");
     4450      uw_panic("exp_head not set in exp_add_nth");
    44514451
    44524452    e = exp_head->next;
    44534453    while(e && e->ent < nn)
  • pith/charset.c

    diff -ur alpine-2.11/pith/charset.c patched/pith/charset.c
    old new  
    424424            if(utf8_charset(cset)){
    425425                if(!utf8_text(&src, cset, &xsrc, 0L)){
    426426                    /* should not happen */
    427                     panic("c-client failed to transliterate recognized characterset");
     427                    uw_panic("c-client failed to transliterate recognized characterset");
    428428                }
    429429            }
    430430            else{
     
    451451            if(!(cs->type == CT_ASCII || cs->type == CT_UTF8)){
    452452                if(!utf8_text_cs(&src, cs, &xsrc, 0L, 0L)){
    453453                    /* should not happen */
    454                     panic("c-client failed to transliterate recognized characterset");
     454                    uw_panic("c-client failed to transliterate recognized characterset");
    455455                }
    456456            }
    457457        }
     
    461461                && utf8_charset(cset)){
    462462                if(!utf8_text(&src, cset, &xsrc, 0L)){
    463463                    /* should not happen */
    464                     panic("c-client failed to transliterate recognized character set");
     464                    uw_panic("c-client failed to transliterate recognized character set");
    465465                }
    466466        }
    467467        else{
  • pith/conf.c

    diff -ur alpine-2.11/pith/conf.c patched/pith/conf.c
    old new  
    19221922     */
    19231923
    19241924    if(reset_character_set_stuff(&err) == -1)
    1925       panic(err ? err : "trouble with character set setup");
     1925      uw_panic(err ? err : "trouble with character set setup");
    19261926    else if(err){
    19271927        init_error(ps, SM_ORDER | SM_DING, 3, 5, err);
    19281928        fs_give((void **) &err);
     
    27432743              case 4: valptr = v->global_val.l; break;
    27442744              case 5: valptr = v->fixed_val.l; break;
    27452745              case 6: valptr = v->cmdline_val.l; break;
    2746               default: panic("bad case in convert_configvar");
     2746              default: uw_panic("bad case in convert_configvar");
    27472747            }
    27482748
    27492749            if(valptr){
     
    27692769              case 4: valptr = &v->global_val.p; break;
    27702770              case 5: valptr = &v->fixed_val.p; break;
    27712771              case 6: valptr = &v->cmdline_val.p; break;
    2772               default: panic("bad case in convert_configvar");
     2772              default: uw_panic("bad case in convert_configvar");
    27732773            }
    27742774
    27752775            if(valptr && *valptr && (*valptr)[0]){
     
    76837683
    76847684    snprintf(buf1, sizeof(buf1), "%.*s", MAX(sizeof(buf1) - 1 - strlen(message), 0), arg);
    76857685    snprintf(buf2, sizeof(buf2), message, buf1);
    7686     panic(buf2);
     7686    uw_panic(buf2);
    76877687}
    76887688
    76897689
  • pith/filter.c

    diff -ur alpine-2.11/pith/filter.c patched/pith/filter.c
    old new  
    365365            fs_give((void **) &sp);
    366366        }
    367367        else
    368           panic("Programmer botch: Can't unstack store readc");
     368          uw_panic("Programmer botch: Can't unstack store readc");
    369369    }
    370370    else
    371       panic("Programmer botch: NULL store clearing store readc");
     371      uw_panic("Programmer botch: NULL store clearing store readc");
    372372}
    373373
    374374
     
    399399            fs_give((void **) &sp);
    400400        }
    401401        else
    402           panic("Programmer botch: Can't unstack store writec");
     402          uw_panic("Programmer botch: Can't unstack store writec");
    403403    }
    404404    else
    405       panic("Programmer botch: NULL store clearing store writec");
     405      uw_panic("Programmer botch: NULL store clearing store writec");
    406406}
    407407
    408408
  • pith/folder.c

    diff -ur alpine-2.11/pith/folder.c patched/pith/folder.c
    old new  
    592592     * collection???
    593593     */
    594594    if(!prime)
    595       panic(_("No folder collections defined"));
     595      uw_panic(_("No folder collections defined"));
    596596
    597597    /*
    598598     * At this point, insert the INBOX mapping as the leading
  • pith/imap.c

    diff -ur alpine-2.11/pith/imap.c patched/pith/imap.c
    old new  
    643643void
    644644mm_fatal(char *message)
    645645{
    646     panic(message);
     646    uw_panic(message);
    647647}
    648648
    649649
  • pith/ldap.c

    diff -ur alpine-2.11/pith/ldap.c patched/pith/ldap.c
    old new  
    17001700        break;
    17011701   
    17021702      default:
    1703         panic("LDAP function not implemented");
     1703        uw_panic("LDAP function not implemented");
    17041704    }
    17051705#endif
    17061706
  • pith/mailcap.c

    diff -ur alpine-2.11/pith/mailcap.c patched/pith/mailcap.c
    old new  
    252252        return;
    253253
    254254      default:
    255         panic("Programmer botch in mc_process_file");
     255        uw_panic("Programmer botch in mc_process_file");
    256256        /*NOTREACHED*/
    257257    }
    258258
  • pith/mailcmd.c

    diff -ur alpine-2.11/pith/mailcmd.c patched/pith/mailcmd.c
    old new  
    29232923                break;
    29242924
    29252925              default:
    2926                 panic("Unexpected incoming startup case");
     2926                uw_panic("Unexpected incoming startup case");
    29272927                break;
    29282928
    29292929  }
  • pith/mailindx.c

    diff -ur alpine-2.11/pith/mailindx.c patched/pith/mailindx.c
    old new  
    12371237                    break;
    12381238                 
    12391239                  default:
    1240                     panic("Unhandled fixed case in setup_index_header");
     1240                    uw_panic("Unhandled fixed case in setup_index_header");
    12411241                    break;
    12421242                }
    12431243            }
     
    33963396    IELEM_S  *ielem;
    33973397
    33983398    if(!buf)
    3399       panic("NULL buf in simple_index_line()");
     3399      uw_panic("NULL buf in simple_index_line()");
    34003400
    34013401    if(buflen > 0)
    34023402      buf[0] = '\0';
     
    52025202                break;
    52035203         
    52045204              default:
    5205                 panic("Unhandled case in prio_str");
     5205                uw_panic("Unhandled case in prio_str");
    52065206                break;
    52075207            }
    52085208
  • pith/mimetype.c

    diff -ur alpine-2.11/pith/mimetype.c patched/pith/mimetype.c
    old new  
    176176            }
    177177        }
    178178        else
    179           panic("Unhandled mime type search");
     179          uw_panic("Unhandled mime type search");
    180180    }
    181181
    182182    /* if we still can not find the type, but it is a .docx (or alike) extension
  • pith/pattern.c

    diff -ur alpine-2.11/pith/pattern.c patched/pith/pattern.c
    old new  
    12951295    char  *p;
    12961296
    12971297    if(!patgrp)
    1298       panic("NULL patgrp to parse_patgrp_slash");
     1298      uw_panic("NULL patgrp to parse_patgrp_slash");
    12991299    else if(!(str && *str)){
    1300         panic("NULL or empty string to parse_patgrp_slash");
     1300        uw_panic("NULL or empty string to parse_patgrp_slash");
    13011301        patgrp->bogus = 1;
    13021302    }
    13031303    else if(!strncmp(str, "/NICK=", 6))
     
    15161516    NAMEVAL_S *v;
    15171517
    15181518    if(!action)
    1519       panic("NULL action to parse_action_slash");
     1519      uw_panic("NULL action to parse_action_slash");
    15201520    else if(!(str && *str))
    1521       panic("NULL or empty string to parse_action_slash");
     1521      uw_panic("NULL or empty string to parse_action_slash");
    15221522    else if(!strncmp(str, "/ROLE=1", 7))
    15231523      action->is_a_role = 1;
    15241524    else if(!strncmp(str, "/OTHER=1", 8))
  • pith/save.c

    diff -ur alpine-2.11/pith/save.c patched/pith/save.c
    old new  
    240240        break;
    241241     
    242242      default:
    243         panic(botch);
     243        uw_panic(botch);
    244244        break;
    245245    }
    246246
  • pith/send.c

    diff -ur alpine-2.11/pith/send.c patched/pith/send.c
    old new  
    437437        fields[++i]   = "X-Our-ReplyTo";        /* ReplyTo is real */
    438438        fields[++i]   = "Lcc";          /* Lcc: too... */
    439439        if(++i != FIELD_COUNT)
    440           panic("Fix FIELD_COUNT");
     440          uw_panic("Fix FIELD_COUNT");
    441441
    442442        for(pf = *custom; pf && pf->name; pf = pf->next)
    443443          if(!pf->standard)
     
    31283128      return((char *)s);
    31293129   
    31303130    if(dlen < SIZEOF_20KBUF)
    3131       panic("bad call to encode_header_value");
     3131      uw_panic("bad call to encode_header_value");
    31323132
    31333133    if(!encode_all){
    31343134        /*
  • pith/sort.c

    diff -ur alpine-2.11/pith/sort.c patched/pith/sort.c
    old new  
    497497    dprint((2, "sort_sort_callback\n"));
    498498
    499499    if(mn_get_total(g_sort.msgmap) < nmsgs)
    500       panic("Message count shrank after sort!");
     500      uw_panic("Message count shrank after sort!");
    501501
    502502    /* copy ulongs to array of longs */
    503503    for(i = nmsgs; i > 0; i--)
  • pith/stream.c

    diff -ur alpine-2.11/pith/stream.c patched/pith/stream.c
    old new  
    17291729                 * partial text.
    17301730                 */
    17311731                if(!str_to_free)
    1732                   panic("Programmer botch: partial fetch attempt w/o string pointer");
     1732                  uw_panic("Programmer botch: partial fetch attempt w/o string pointer");
    17331733                else
    17341734                  *str_to_free = (char *) new_text.data;
    17351735            }
  • pith/string.c

    diff -ur alpine-2.11/pith/string.c patched/pith/string.c
    old new  
    26712671    char *ans = NULL;
    26722672
    26732673    if(!quote_these_chars)
    2674       panic("bad arg to add_escapes");
     2674      uw_panic("bad arg to add_escapes");
    26752675
    26762676    if(src){
    26772677        char *q, *p, *qchar;
  • pith/util.h

    diff -ur alpine-2.11/pith/util.h patched/pith/util.h
    old new  
    5656/* currently mandatory to implement stubs */
    5757
    5858/* called when we detect a serious program error */
    59 void      panic(char *);
     59void      uw_panic(char *);
    6060
    6161/* called when testing to see if panic state is in effect */
    6262int      panicking(void);
  • web/src/alpined.d/signal.c

    diff -ur alpine-2.11/web/src/alpined.d/signal.c patched/web/src/alpined.d/signal.c
    old new  
    128128      (void) unlink(peSocketName);
    129129
    130130    snprintf(tmp_20k_buf, SIZEOF_20KBUF, "Abort: signal %d", sig);
    131     panic(tmp_20k_buf);         /* clean up and get out */
     131    uw_panic(tmp_20k_buf);              /* clean up and get out */
    132132    exit(-1);                   /* in case panic doesn't kill us */
    133133}
    134134
  • web/src/alpined.d/stubs.c

    diff -ur alpine-2.11/web/src/alpined.d/stubs.c patched/web/src/alpined.d/stubs.c
    old new  
    100100  This is also called from imap routines and fs_get and fs_resize.
    101101  ----*/
    102102void
    103 panic(message)
     103uw_panic(message)
    104104    char *message;
    105105{
    106106    in_panic = 1;