Changeset 1002:7031f78a923f for compose.c

Timestamp:

1999-04-12 12:13:29 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Clean-up, from Vikas.

Files:

• compose.c (modified) (4 diffs)

compose.c

@@ -445 +445 @@
   CONTEXT *ctx = NULL, *this = NULL;
   /* Sort, SortAux could be changed in mutt_index_menu() */
-  int oldSort = Sort, oldSortAux = SortAux;
+  int oldSort, oldSortAux;
   struct stat st;
-  char **files;
-  int numfiles;
 
   idx = mutt_gen_attach_list (msg->content, -1, idx, &idxlen, &idxmax, 0, 1);
@@ -594 +592 @@
 
       case OP_COMPOSE_ATTACH_FILE:
-      case OP_COMPOSE_ATTACH_MESSAGE:
-
-        fname[0] = 0;
-        {
-          char* prompt;
-          int flag;
-
-          if (op == OP_COMPOSE_ATTACH_FILE)
-          {
-            prompt = _("Attach file");
-            flag = 0;
-            numfiles = 0;
-            files = NULL;
-            if (_mutt_enter_fname (prompt, fname, sizeof (fname), &menu->redraw, flag, 1, &files, &numfiles) == -1)
-              break;
-          }
-          else
-          {
-            prompt = _("Open mailbox to attach message from");
-            if (Context)
-            {
-              strfcpy (fname, NONULL (Context->path), sizeof (fname));
-              mutt_pretty_mailbox (fname);
-            }
-            flag = 1;
-            if (mutt_enter_fname (prompt, fname, sizeof (fname), &menu->redraw, flag) == -1 || !fname[0])
-              break;
-            mutt_expand_path (fname, sizeof (fname));
-            /* check to make sure the file exists and is readable */
-            if (access (fname, R_OK) == -1)
-            {
-              mutt_perror (fname);
-              break;
-            }
-          }
-        }
-
-        if (op == OP_COMPOSE_ATTACH_MESSAGE)
-        {
-          menu->redraw = REDRAW_FULL;
-
-          ctx = mx_open_mailbox (fname, M_READONLY, NULL);
-          if (ctx == NULL)
-          {
-            mutt_perror (fname);
+        {
+          char *prompt, **files;
+          int error, numfiles;
+
+          fname[0] = 0;
+          prompt = _("Attach file");
+          numfiles = 0;
+          files = NULL;
+
+          if (_mutt_enter_fname (prompt, fname, sizeof (fname), &menu->redraw, 0, 1, &files, &numfiles) == -1)
             break;
-          }
-
-          if (!ctx->msgcount)
-          {
-            mx_close_mailbox (ctx);
-            safe_free ((void **) &ctx);
-            mutt_error _("No messages in that folder.");
-            break;
-          }
-          
-          this = Context; /* remember current folder */
-          Context = ctx;
-          set_option(OPTATTACHMSG);
-          mutt_message _("Tag the messages you want to attach!");
-          close = mutt_index_menu ();
-          unset_option(OPTATTACHMSG);
-
-          if (!Context)
-          {
-            /* go back to the folder we started from */
-            Context = this;
-            /* Restore old $sort and $sort_aux */
-            Sort = oldSort;
-            SortAux = oldSortAux;
-            menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;
-            break;
-          }
-        }
-
-        {
-          int numtag = 0;
-
-          if (op == OP_COMPOSE_ATTACH_MESSAGE)
-            numtag = Context->tagged;
-          else
-            numtag = numfiles;
-          if (idxlen + numtag >= idxmax)
-          {
-            safe_realloc ((void **) &idx, sizeof (ATTACHPTR *) * (idxmax += 5 + numtag));
+
+          if (idxlen + numfiles >= idxmax)
+          {
+            safe_realloc ((void **) &idx, sizeof (ATTACHPTR *) * (idxmax += 5 + numfiles));
             menu->data = idx;
           }
-        }
-
-        if (op == OP_COMPOSE_ATTACH_FILE)
-        {
-          int error = 0;
-          mutt_message _("Attaching selected files...");
+
+          error = 0;
+          if (numfiles > 1)
+            mutt_message _("Attaching selected files...");
           for (i = 0; i < numfiles; i++)
           {
@@ -700 +626 @@
               safe_free ((void **) &idx[idxlen]);
             }
-            FREE (&this);
-          }
+          }
+          
           FREE (&files);
-          if (!error)
-            mutt_clear_error ();
+          if (!error) mutt_clear_error ();
+
           menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;
-        }
-        else
-        {
+        }
+        break;
+
+      case OP_COMPOSE_ATTACH_MESSAGE:
+        {
+          char *prompt;
           HEADER *h;
+
+          fname[0] = 0;
+          prompt = _("Open mailbox to attach message from");
+
+          if (Context)
+          {
+            strfcpy (fname, NONULL (Context->path), sizeof (fname));
+            mutt_pretty_mailbox (fname);
+          }
+
+          if (mutt_enter_fname (prompt, fname, sizeof (fname), &menu->redraw, 1) == -1 || !fname[0])
+            break;
+
+          mutt_expand_path (fname, sizeof (fname));
+          /* check to make sure the file exists and is readable */
+          if (access (fname, R_OK) == -1)
+          {
+            mutt_perror (fname);
+            break;
+          }
+
+          menu->redraw = REDRAW_FULL;
+
+          ctx = mx_open_mailbox (fname, M_READONLY, NULL);
+          if (ctx == NULL)
+          {
+            mutt_perror (fname);
+            break;
+          }
+
+          if (!ctx->msgcount)
+          {
+            mx_close_mailbox (ctx);
+            safe_free ((void **) &ctx);
+            mutt_error _("No messages in that folder.");
+            break;
+          }
+
+          this = Context; /* remember current folder and sort methods*/
+          oldSort = Sort; oldSortAux = SortAux;
+          
+          Context = ctx;
+          set_option(OPTATTACHMSG);
+          mutt_message _("Tag the messages you want to attach!");
+          close = mutt_index_menu ();
+          unset_option(OPTATTACHMSG);
+
+          if (!Context)
+          {
+            /* go back to the folder we started from */
+            Context = this;
+            /* Restore old $sort and $sort_aux */
+            Sort = oldSort;
+            SortAux = oldSortAux;
+            menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;
+            break;
+          }
+
+          if (idxlen + Context->tagged >= idxmax)
+          {
+            safe_realloc ((void **) &idx, sizeof (ATTACHPTR *) * (idxmax += 5 + Context->tagged));
+            menu->data = idx;
+          }
+
           for (i = 0; i < Context->msgcount; i++)
           {
@@ -740 +733 @@
           SortAux = oldSortAux;
         }
-
         break;