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

alpine/adrbkcmd.c

@@ -530 +530 @@
         break;
 
       default:
-        panic("Unexpected command in process_abook_view_cmd");
+        uw_panic("Unexpected command in process_abook_view_cmd");
         break;
     }
 
@@ -2639 +2639 @@
     }
 
     if(!ps->prc)
-      panic("NULL prc in convert_to_remote_config");
+      uw_panic("NULL prc in convert_to_remote_config");
 
     dprint((2, "convert_to_remote_config\n"));
     
@@ -5019 +5019 @@
             break;
           
           default:
-            panic("can't happen in write_single_vcard_entry");
+            uw_panic("can't happen in write_single_vcard_entry");
         }
 
         for(; ll && *ll; ll++){
@@ -5152 +5152 @@
             break;
 
           default:
-            panic("can't happen in write_single_tab_entry");
+            uw_panic("can't happen in write_single_tab_entry");
         }
 
         if(i)
@@ -7374 +7374 @@
         break;
 
       default:
-        panic("Unexpected command in process_ldap_cmd");
+        uw_panic("Unexpected command in process_ldap_cmd");
         break;
     }
 

alpine/alpine.c

@@ -2354 +2354 @@
         break;
 
       default:
-        panic("Unexpected command in choose_setup_cmd");
+        uw_panic("Unexpected command in choose_setup_cmd");
         break;
     }
 
@@ -3358 +3358 @@
   This is also called from imap routines and fs_get and fs_resize.
   ----*/
 void
-panic(char *message)
+uw_panic(char *message)
 {
     char buf[256];
 

alpine/confscroll.c

@@ -5333 +5333 @@
         }
         else{
             if(reset_character_set_stuff(&err) == -1)
-              panic(err ? err : "trouble with Character-Set");
+              uw_panic(err ? err : "trouble with Character-Set");
             else if(err){
                 q_status_message(SM_ORDER | SM_DING, 3, 5, err);
                 fs_give((void **) &err);
@@ -5349 +5349 @@
         }
         else{
             if(reset_character_set_stuff(&err) == -1)
-              panic(err ? err : "trouble with Character-Set");
+              uw_panic(err ? err : "trouble with Character-Set");
             else if(err){
                 q_status_message(SM_ORDER | SM_DING, 3, 5, err);
                 fs_give((void **) &err);

alpine/folder.c

@@ -1024 +1024 @@
                   strncat(servpart, "#news.", sizeof(servpart)-1-strlen(servpart));
             }
             else
-              panic("Unexpected invalid server");
+              uw_panic("Unexpected invalid server");
         }
         else
           servpart[0] = '\0';

alpine/help.c

@@ -431 +431 @@
         break;
 
       default :
-        panic("Unhandled case");
+        uw_panic("Unhandled case");
     }
 
     return(rv);
@@ -898 +898 @@
         break;
 
       default:
-        panic("Unexpected command in journal_processor");
+        uw_panic("Unexpected command in journal_processor");
         break;
     }
     

alpine/imap.c

@@ -1842 +1842 @@
         break;
 
       default:
-        panic("Unexpected command in answer_cert_failure");
+        uw_panic("Unexpected command in answer_cert_failure");
         break;
     }
 

alpine/mailcmd.c

@@ -1479 +1479 @@
 
           /*--------- Default, unknown command ----------*/
       default:
-        panic("Unexpected command case");
+        uw_panic("Unexpected command case");
         break;
     }
 
@@ -2676 +2676 @@
     RULE_RESULT      *rule;
 
     if(!cntxt)
-      panic("no context ptr in save_prompt");
+      uw_panic("no context ptr in save_prompt");
 
     init_hist(&history, HISTSIZE);
 
@@ -3068 +3068 @@
             break;
 
           default :
-            panic("Unhandled case");
+            uw_panic("Unhandled case");
             break;
         }
 
@@ -5713 +5713 @@
             break;
 
           default :
-            panic("Unhandled case");
+            uw_panic("Unhandled case");
             break;
         }
 

alpine/mailpart.c

@@ -2631 +2631 @@
         break;
 
       default:
-        panic("Unexpected command case");
+        uw_panic("Unexpected command case");
         break;
     }
 

alpine/mailview.c

@@ -1068 +1068 @@
 
 
       default :
-        panic("Unexpected HANDLE type");
+        uw_panic("Unexpected HANDLE type");
     }
 
     return(0);
@@ -1171 +1171 @@
         }
 
         if(l == start_line)
-          panic("Internal Error: no handle found");
+          uw_panic("Internal Error: no handle found");
         else
           start_line = l;
     }

alpine/newuser.c

@@ -197 +197 @@
         break;
 
       default :
-        panic("Unhandled case");
+        uw_panic("Unhandled case");
     }
 
     return(rv);

alpine/radio.c

@@ -280 +280 @@
 
         if(flags & RB_RET_HELP){
             if(help_text != NO_HELP)
-              panic("RET_HELP and help in radio_buttons!");
+              uw_panic("RET_HELP and help in radio_buttons!");
 
             button_list[b].ch = '?';
             button_list[b].rval = 3;
@@ -360 +360 @@
     clrbitmap(bitmap);
     memset(fkey_table, NO_OP_COMMAND, 12 * sizeof(int));
     if(flags & RB_RET_HELP && help_text != NO_HELP)
-      panic("RET_HELP and help in radio_buttons!");
+      uw_panic("RET_HELP and help in radio_buttons!");
 
     /* if shown, always at position 0 */
     if(help_text != NO_HELP || flags & RB_RET_HELP){
@@ -398 +398 @@
                && esc_list[i-start].label[0] != '\0'){  /* visible */
                 if(i == 12){  /* special case where we put it in help slot */
                     if(help_text != NO_HELP)
-                  panic("Programming botch in radio_buttons(): too many keys");
+                  uw_panic("Programming botch in radio_buttons(): too many keys");
 
                     if(esc_list[i-start].ch != -2)
                       setbitn(0, bitmap); /* the help slot */
@@ -420 +420 @@
                       rb_keymenu.keys[0].label = esc_list[i-start].label;
                 }
                 else
-                  panic("Botch in radio_buttons(): too many keys");
+                  uw_panic("Botch in radio_buttons(): too many keys");
             }
         }
         else{
@@ -823 +823 @@
      */
     for(i=0; list1 && list1[i].ch != -1; i++){
         if(list1[i].rval == list[j].rval)
-          panic("1bad rval in d_r");
+          uw_panic("1bad rval in d_r");
         if(F_OFF(F_USE_FK,ps_global) && list1[i].ch == list[j].ch)
-          panic("1bad ch in ccl");
+          uw_panic("1bad ch in ccl");
     }
 
     for(i=0; list2 && list2[i].ch != -1; i++){
         if(list2[i].rval == list[j].rval)
-          panic("2bad rval in d_r");
+          uw_panic("2bad rval in d_r");
         if(F_OFF(F_USE_FK,ps_global) && list2[i].ch == list[j].ch)
-          panic("2bad ch in ccl");
+          uw_panic("2bad ch in ccl");
     }
 
     j++;
@@ -840 +840 @@
     /* the visible set */
     for(i=0; list1 && list1[i].ch != -1; i++){
         if(i >= KEYS_PER_LIST && list1[i].label[0] != '\0')
-          panic("too many visible keys in ccl");
+          uw_panic("too many visible keys in ccl");
 
         list[j++] = list1[i];
     }

alpine/remote.c

@@ -248 +248 @@
         break;
 
       default:
-        panic("Unexpected command in rd_answer_forge_warning");
+        uw_panic("Unexpected command in rd_answer_forge_warning");
         break;
     }
 

alpine/roleconf.c

@@ -5935 +5935 @@
     char ***alval;
 
     if(!(v && name))
-      panic("setup_dummy_pattern_var");
+      uw_panic("setup_dummy_pattern_var");
 
     v->name = (char *) fs_get(strlen(name)+NOTLEN+1);
     snprintf(v->name, strlen(name)+NOTLEN+1, "%s%s", (defpat && defpat->not) ? NOT : "", name);

alpine/signal.c

@@ -188 +188 @@
     snprintf(buf, sizeof(buf), "Received abort signal(sig=%d)", sig);
     buf[sizeof(buf)-1] = '\0';
 
-    panic(buf);                         /* clean up and get out */
+    uw_panic(buf);                              /* clean up and get out */
 
     exit(-1);                           /* in case panic doesn't kill us */
 }

pith/adrbklib.c

@@ -4343 +4343 @@
 
     nn = (adrbk_cntr_t)n;
     if(!exp_head)
-      panic("exp_head not set in exp_set_expanded");
+      uw_panic("exp_head not set in exp_set_expanded");
 
     for(e = exp_head; e->next; e = e->next)
       if(e->next->ent >= nn)
@@ -4375 +4375 @@
 
     nn = (adrbk_cntr_t)n;
     if(!exp_head)
-      panic("exp_head not set in exp_unset_expanded");
+      uw_panic("exp_head not set in exp_unset_expanded");
 
     for(e = exp_head; e->next; e = e->next)
       if(e->next->ent >= nn)
@@ -4407 +4407 @@
 
     nn = (adrbk_cntr_t)n;
     if(!exp_head)
-      panic("exp_head not set in exp_del_nth");
+      uw_panic("exp_head not set in exp_del_nth");
 
     e = exp_head->next;
     while(e && e->ent < nn)
@@ -4447 +4447 @@
 
     nn = (adrbk_cntr_t)n;
     if(!exp_head)
-      panic("exp_head not set in exp_add_nth");
+      uw_panic("exp_head not set in exp_add_nth");
 
     e = exp_head->next;
     while(e && e->ent < nn)

pith/charset.c

@@ -424 +424 @@
             if(utf8_charset(cset)){
                 if(!utf8_text(&src, cset, &xsrc, 0L)){
                     /* should not happen */
-                    panic("c-client failed to transliterate recognized characterset");
+                    uw_panic("c-client failed to transliterate recognized characterset");
                 }
             }
             else{
@@ -451 +451 @@
             if(!(cs->type == CT_ASCII || cs->type == CT_UTF8)){
                 if(!utf8_text_cs(&src, cs, &xsrc, 0L, 0L)){
                     /* should not happen */
-                    panic("c-client failed to transliterate recognized characterset");
+                    uw_panic("c-client failed to transliterate recognized characterset");
                 }
             }
         }
@@ -461 +461 @@
                 && utf8_charset(cset)){
                 if(!utf8_text(&src, cset, &xsrc, 0L)){
                     /* should not happen */
-                    panic("c-client failed to transliterate recognized character set");
+                    uw_panic("c-client failed to transliterate recognized character set");
                 }
         }
         else{

pith/conf.c

@@ -1922 +1922 @@
      */
 
     if(reset_character_set_stuff(&err) == -1)
-      panic(err ? err : "trouble with character set setup");
+      uw_panic(err ? err : "trouble with character set setup");
     else if(err){
         init_error(ps, SM_ORDER | SM_DING, 3, 5, err);
         fs_give((void **) &err);
@@ -2743 +2743 @@
               case 4: valptr = v->global_val.l; break;
               case 5: valptr = v->fixed_val.l; break;
               case 6: valptr = v->cmdline_val.l; break;
-              default: panic("bad case in convert_configvar");
+              default: uw_panic("bad case in convert_configvar");
             }
 
             if(valptr){
@@ -2769 +2769 @@
               case 4: valptr = &v->global_val.p; break;
               case 5: valptr = &v->fixed_val.p; break;
               case 6: valptr = &v->cmdline_val.p; break;
-              default: panic("bad case in convert_configvar");
+              default: uw_panic("bad case in convert_configvar");
             }
 
             if(valptr && *valptr && (*valptr)[0]){
@@ -7683 +7683 @@
 
     snprintf(buf1, sizeof(buf1), "%.*s", MAX(sizeof(buf1) - 1 - strlen(message), 0), arg);
     snprintf(buf2, sizeof(buf2), message, buf1);
-    panic(buf2);
+    uw_panic(buf2);
 }
 
 

pith/filter.c

@@ -365 +365 @@
             fs_give((void **) &sp);
         }
         else
-          panic("Programmer botch: Can't unstack store readc");
+          uw_panic("Programmer botch: Can't unstack store readc");
     }
     else
-      panic("Programmer botch: NULL store clearing store readc");
+      uw_panic("Programmer botch: NULL store clearing store readc");
 }
 
 
@@ -399 +399 @@
             fs_give((void **) &sp);
         }
         else
-          panic("Programmer botch: Can't unstack store writec");
+          uw_panic("Programmer botch: Can't unstack store writec");
     }
     else
-      panic("Programmer botch: NULL store clearing store writec");
+      uw_panic("Programmer botch: NULL store clearing store writec");
 }
 
 

pith/folder.c

@@ -592 +592 @@
      * collection???
      */
     if(!prime)
-      panic(_("No folder collections defined"));
+      uw_panic(_("No folder collections defined"));
 
     /*
      * At this point, insert the INBOX mapping as the leading

pith/imap.c

@@ -643 +643 @@
 void
 mm_fatal(char *message)
 {
-    panic(message);
+    uw_panic(message);
 }
 
 

pith/ldap.c

@@ -1700 +1700 @@
         break;
     
       default:
-        panic("LDAP function not implemented");
+        uw_panic("LDAP function not implemented");
     }
 #endif
 

pith/mailcap.c

@@ -252 +252 @@
         return;
 
       default:
-        panic("Programmer botch in mc_process_file");
+        uw_panic("Programmer botch in mc_process_file");
         /*NOTREACHED*/
     }
 

pith/mailcmd.c

@@ -2923 +2923 @@
                 break;
 
               default:
-                panic("Unexpected incoming startup case");
+                uw_panic("Unexpected incoming startup case");
                 break;
 
   }

pith/mailindx.c

@@ -1237 +1237 @@
                     break;
                   
                   default:
-                    panic("Unhandled fixed case in setup_index_header");
+                    uw_panic("Unhandled fixed case in setup_index_header");
                     break;
                 }
             }
@@ -3396 +3396 @@
     IELEM_S  *ielem;
 
     if(!buf)
-      panic("NULL buf in simple_index_line()");
+      uw_panic("NULL buf in simple_index_line()");
 
     if(buflen > 0)
       buf[0] = '\0';
@@ -5202 +5202 @@
                 break;
           
               default:
-                panic("Unhandled case in prio_str");
+                uw_panic("Unhandled case in prio_str");
                 break;
             }
 

pith/mimetype.c

@@ -176 +176 @@
             }
         }
         else
-          panic("Unhandled mime type search");
+          uw_panic("Unhandled mime type search");
     }
 
     /* if we still can not find the type, but it is a .docx (or alike) extension

pith/pattern.c

@@ -1295 +1295 @@
     char  *p;
 
     if(!patgrp)
-      panic("NULL patgrp to parse_patgrp_slash");
+      uw_panic("NULL patgrp to parse_patgrp_slash");
     else if(!(str && *str)){
-        panic("NULL or empty string to parse_patgrp_slash");
+        uw_panic("NULL or empty string to parse_patgrp_slash");
         patgrp->bogus = 1;
     }
     else if(!strncmp(str, "/NICK=", 6))
@@ -1516 +1516 @@
     NAMEVAL_S *v;
 
     if(!action)
-      panic("NULL action to parse_action_slash");
+      uw_panic("NULL action to parse_action_slash");
     else if(!(str && *str))
-      panic("NULL or empty string to parse_action_slash");
+      uw_panic("NULL or empty string to parse_action_slash");
     else if(!strncmp(str, "/ROLE=1", 7))
       action->is_a_role = 1;
     else if(!strncmp(str, "/OTHER=1", 8))

pith/save.c

@@ -240 +240 @@
         break;
       
       default:
-        panic(botch);
+        uw_panic(botch);
         break;
     }
 

pith/send.c

@@ -437 +437 @@
         fields[++i]   = "X-Our-ReplyTo";        /* ReplyTo is real */
         fields[++i]   = "Lcc";          /* Lcc: too... */
         if(++i != FIELD_COUNT)
-          panic("Fix FIELD_COUNT");
+          uw_panic("Fix FIELD_COUNT");
 
         for(pf = *custom; pf && pf->name; pf = pf->next)
           if(!pf->standard)
@@ -3128 +3128 @@
       return((char *)s);
     
     if(dlen < SIZEOF_20KBUF)
-      panic("bad call to encode_header_value");
+      uw_panic("bad call to encode_header_value");
 
     if(!encode_all){
         /*

pith/sort.c

@@ -497 +497 @@
     dprint((2, "sort_sort_callback\n"));
 
     if(mn_get_total(g_sort.msgmap) < nmsgs)
-      panic("Message count shrank after sort!");
+      uw_panic("Message count shrank after sort!");
 
     /* copy ulongs to array of longs */
     for(i = nmsgs; i > 0; i--)

pith/stream.c

@@ -1729 +1729 @@
                  * partial text.
                  */
                 if(!str_to_free)
-                  panic("Programmer botch: partial fetch attempt w/o string pointer");
+                  uw_panic("Programmer botch: partial fetch attempt w/o string pointer");
                 else
                   *str_to_free = (char *) new_text.data;
             }

pith/string.c

@@ -2671 +2671 @@
     char *ans = NULL;
 
     if(!quote_these_chars)
-      panic("bad arg to add_escapes");
+      uw_panic("bad arg to add_escapes");
 
     if(src){
         char *q, *p, *qchar;

pith/util.h

@@ -56 +56 @@
 /* currently mandatory to implement stubs */
 
 /* called when we detect a serious program error */
-void      panic(char *);
+void      uw_panic(char *);
 
 /* called when testing to see if panic state is in effect */
 int      panicking(void);

web/src/alpined.d/signal.c

@@ -128 +128 @@
       (void) unlink(peSocketName);
 
     snprintf(tmp_20k_buf, SIZEOF_20KBUF, "Abort: signal %d", sig);
-    panic(tmp_20k_buf);         /* clean up and get out */
+    uw_panic(tmp_20k_buf);              /* clean up and get out */
     exit(-1);                   /* in case panic doesn't kill us */
 }
 

web/src/alpined.d/stubs.c

@@ -100 +100 @@
   This is also called from imap routines and fs_get and fs_resize.
   ----*/
 void
-panic(message)
+uw_panic(message)
     char *message;
 {
     in_panic = 1;