* somehow all.patch got here. Reversing.

1 files changed, 10 insertions, 46 deletions

diff --git a/alpine/alpine.c b/alpine/alpine.c
index 838473ec..9e7298f2 100644
--- a/alpine/alpine.c
+++ b/alpine/alpine.c
@@ -308,7 +308,6 @@ main(int argc, char **argv)
     mail_parameters(NULL, SET_SENDCOMMAND, (void *) pine_imap_cmd_happened);
     mail_parameters(NULL, SET_FREESTREAMSPAREP, (void *) sp_free_callback);
     mail_parameters(NULL, SET_FREEELTSPAREP,    (void *) free_pine_elt);
-    mail_parameters(NULL, SET_ERASEPASSWORD, (void *) pine_delete_pwd);
 #ifdef	SMIME
     mail_parameters(NULL, SET_FREEBODYSPAREP,   (void *) free_smime_body_sparep);
 #endif
@@ -460,11 +459,6 @@ main(int argc, char **argv)
 
     convert_args_to_utf8(pine_state, &args);
 
-    if (args.action == aaFolder && !args.data.folder &&
-		ps_global->send_immediately){
-	printf(_("No value for To: field specified\n"));
-	exit(-1);
-    }
     if(args.action == aaFolder){
 	pine_state->beginning_of_month = first_run_of_month();
 	pine_state->beginning_of_year = first_run_of_year();
@@ -473,7 +467,6 @@ main(int argc, char **argv)
     /* Set up optional for user-defined display filtering */
     pine_state->tools.display_filter	     = dfilter;
     pine_state->tools.display_filter_trigger = dfilter_trigger;
-    pine_state->tools.exec_rule		     = exec_function_rule;
 
 #ifdef _WINDOWS
     if(ps_global->install_flag){
@@ -565,11 +558,6 @@ main(int argc, char **argv)
     if(F_ON(F_MAILDROPS_PRESERVE_STATE, ps_global))
       mail_parameters(NULL, SET_SNARFPRESERVE, (void *) TRUE);
 
-#ifndef _WINDOWS
-    mail_parameters(NULL,SET_COURIERSTYLE,
-               (void *)(F_ON(F_COURIER_FOLDER_LIST, ps_global) ? 1 : 0));
-#endif
-
     rvl = 0L;
     if(pine_state->VAR_NNTPRANGE){
 	if(!SVAR_NNTPRANGE(pine_state, rvl, tmp_20k_buf, SIZEOF_20KBUF))
@@ -689,7 +677,6 @@ main(int argc, char **argv)
         
 
     /*--- output side ---*/
-    if (!ps_global->send_immediately){
     rv = config_screen(&(pine_state->ttyo));
 #ifndef _WINDOWS	/* always succeeds under _WINDOWS */
     if(rv){
@@ -730,6 +717,12 @@ main(int argc, char **argv)
     /* initialize titlebar in case we use it */
     set_titlebar("", NULL, NULL, NULL, NULL, 0, FolderName, 0, 0, NULL);
 
+    /*
+     * Prep storage object driver for PicoText 
+     */
+    so_register_external_driver(pine_pico_get, pine_pico_give, pine_pico_writec, pine_pico_readc, 
+				pine_pico_puts, pine_pico_seek, NULL, NULL);
+
 #ifdef	DEBUG
     if(ps_global->debug_imap > 4 || debug > 9){
 	q_status_message(SM_ORDER | SM_DING, 5, 9,
@@ -737,19 +730,6 @@ main(int argc, char **argv)
 	flush_status_messages(0);
     }
 #endif
-    }
-    else{
-     fake_config_screen(&(pine_state->ttyo));
-     init_folders(pine_state);		/* digest folder spec's */
-    }
-
-    /*
-     * Prep storage object driver for PicoText 
-     */
-    so_register_external_driver(pine_pico_get, pine_pico_give, 
-	(args.noutf8 == 0 ? pine_pico_writec : pine_pico_writec_noucs), 
-	(args.noutf8 == 0 ? pine_pico_readc : pine_pico_readc_noucs), 
-	(args.noutf8 == 0 ? pine_pico_puts : pine_pico_puts_noucs), pine_pico_seek, NULL, NULL);
 
     if(args.action == aaPrcCopy || args.action == aaAbookCopy){
 	int   exit_val = -1;
@@ -925,12 +905,6 @@ main(int argc, char **argv)
         int	    len, good_addr = 1;
 	int	    exit_val = 0;
 	BUILDER_ARG fcc;
-        ACTION_S  *role = NULL;
-
-        if (pine_state->in_init_seq && pine_state->send_immediately
-		&&  (char) *pine_state->initial_cmds++ == '#'
-		&&  ++pine_state->initial_cmds_offset)
-            role_select_screen(pine_state, &role, 1);
 
 	if(pine_state->in_init_seq){
 	    pine_state->in_init_seq = pine_state->save_in_init_seq = 0;
@@ -969,7 +943,7 @@ main(int argc, char **argv)
 	  memset(&fcc, 0, sizeof(fcc));
 
 	if(good_addr){
-	    compose_mail(addr, fcc.tptr, role,
+	    compose_mail(addr, fcc.tptr, NULL,
 			 args.data.mail.attachlist, stdin_getc);
 	}
 	else{
@@ -1003,7 +977,6 @@ main(int argc, char **argv)
             
         pine_state->mail_stream    = NULL;
         pine_state->mangled_screen = 1;
-        pine_state->subject        = NULL;
 
 	if(args.action == aaURL){
 	    url_tool_t f;
@@ -1119,7 +1092,6 @@ main(int argc, char **argv)
 	    }
         }
 
-       if (!pine_state->send_immediately)
         fflush(stdout);
 
 #if !defined(_WINDOWS) && !defined(LEAVEOUTFIFO)
@@ -3008,15 +2980,10 @@ process_init_cmds(struct pine *ps, char **list)
     if(i > 0){
 	ps->initial_cmds = (int *)fs_get((i+1) * sizeof(int));
 	ps->free_initial_cmds = ps->initial_cmds;
-	ps->initial_cmds_backup = (int *)fs_get((i+1) * sizeof(int));
-	ps->free_initial_cmds_backup = ps->initial_cmds_backup;
 	for(j = 0; j < i; j++)
-	  ps->initial_cmds[j] = ps->initial_cmds_backup[j] = i_cmds[j];
-#define ctrl_x 24
-      if (i > 1)
-	ps->send_immediately = i_cmds[i - 2] == ctrl_x
-			&& ((i_cmds[i - 1] == 'y') || (i_cmds[i-1] == 'Y'));
-	ps->initial_cmds[i] = ps->initial_cmds_backup[i] = 0;
+	  ps->initial_cmds[j] = i_cmds[j];
+
+	ps->initial_cmds[i] = 0;
 	ps->in_init_seq = ps->save_in_init_seq = 1;
     }
 }
@@ -3172,9 +3139,6 @@ goodnight_gracey(struct pine *pine_state, int exit_val)
     extern KBESC_T *kbesc;
 
     dprint((2, "goodnight_gracey:\n"));    
-    strncpy(pine_state->cur_folder, pine_state->inbox_name, 
-					sizeof(pine_state->cur_folder));
-    pine_state->cur_folder[sizeof(pine_state->cur_folder) - 1] = '\0';
 
     /* We want to do this here before we close up the streams */
     trim_remote_adrbks();