/[mailutils]/mailutils/mail/var.c
ViewVC logotype

Diff of /mailutils/mail/var.c

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

revision 1.19 by gray, Sun Mar 23 22:49:53 2003 UTC revision 1.20 by gray, Tue Aug 12 11:34:04 2003 UTC
# Line 175  var_shell (int argc, char **argv, compos Line 175  var_shell (int argc, char **argv, compos
175  {  {
176    int status;    int status;
177    ofile = env->ofile;    ofile = env->ofile;
178    status = mail_shell (argc, argv);    ++*argv;
179      status = mail_execute (1, argc, argv);
180    ofile = env->file;    ofile = env->file;
181    return status;    return status;
182  }  }
# Line 298  var_deadletter (int argc ARG_UNUSED, cha Line 299  var_deadletter (int argc ARG_UNUSED, cha
299    return 0;    return 0;
300  }  }
301    
302    static void
303    run_editor (char *ed, char *arg)
304    {
305      char *argv[3];
306    
307      argv[0] = ed;
308      argv[1] = arg;
309      argv[2] = NULL;
310      return mail_execute (1, 2, argv);
311    }
312    
313  static int  static int
314  var_run_editor (char *ed, int argc, char **argv, compose_env_t *env)  var_run_editor (char *ed, int argc, char **argv, compose_env_t *env)
315  {  {
# Line 320  var_run_editor (char *ed, int argc, char Line 332  var_run_editor (char *ed, int argc, char
332        do        do
333          {          {
334            fclose (fp);            fclose (fp);
335            util_do_command ("!%s %s", ed, filename);            run_editor (ed, filename);
336            fp = fopen (filename, "r");            fp = fopen (filename, "r");
337          }          }
338        while ((rc = parse_headers (fp, env)) < 0);        while ((rc = parse_headers (fp, env)) < 0);
# Line 341  var_run_editor (char *ed, int argc, char Line 353  var_run_editor (char *ed, int argc, char
353      {      {
354        fclose (env->file);        fclose (env->file);
355        ofile = env->ofile;        ofile = env->ofile;
356        util_do_command ("!%s %s", ed, env->filename);        run_editor (ed, env->filename);
357      }      }
358    
359    env->file = fopen (env->filename, "a+");    env->file = fopen (env->filename, "a+");

Legend:
Removed from v.1.19  
changed lines
  Added in v.1.20

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26