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

Diff of /mailutils/mail/from.c

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

revision 1.13 by alainm, Sat Sep 15 20:50:42 2001 UTC revision 1.14 by gray, Thu Aug 15 12:55:42 2002 UTC
# Line 32  mail_from (int argc, char **argv) Line 32  mail_from (int argc, char **argv)
32        header_t hdr = NULL;        header_t hdr = NULL;
33        envelope_t env;        envelope_t env;
34        attribute_t attr;        attribute_t attr;
35        char *from = NULL, *subj = NULL;        char *from = NULL, *subj = NULL, *fromp, *subjp;
36        int froml, subjl;        int froml, subjl;
37        char date[80], st[10];        char date[80], st[10];
38        int cols = util_getcols () - 6;        int cols = util_getcols () - 6;
# Line 70  mail_from (int argc, char **argv) Line 70  mail_from (int argc, char **argv)
70          }          }
71        header_aget_value (hdr, MU_HEADER_SUBJECT, &subj);        header_aget_value (hdr, MU_HEADER_SUBJECT, &subj);
72    
       if (from == NULL || subj == NULL)  
         {  
           free (from);  
           free (subj);  
           return 1;  
         }  
   
73        message_get_attribute (msg, &attr);        message_get_attribute (msg, &attr);
74    
75        if (attribute_is_userflag(attr, MAIL_ATTRIBUTE_MBOXED))        if (attribute_is_userflag(attr, MAIL_ATTRIBUTE_MBOXED))
# Line 113  mail_from (int argc, char **argv) Line 106  mail_from (int argc, char **argv)
106        froml = cols / 3;        froml = cols / 3;
107        subjl = cols - froml - strlen (st) - strlen (date);        subjl = cols - froml - strlen (st) - strlen (date);
108    
109          fromp = from ? from : "";
110          subjp = subj ? subj : fromp;
111        fprintf (ofile, "%c%c%4d %-18.18s %-16.16s %s %.*s\n",        fprintf (ofile, "%c%c%4d %-18.18s %-16.16s %s %.*s\n",
112                 cursor == realcursor ? '>' : ' ', cflag, cursor,                 cursor == realcursor ? '>' : ' ', cflag, cursor,
113                 from, date, st, (subjl < 0) ? 0 : subjl, subj);                 fromp, date, st, (subjl < 0) ? 0 : subjl, subjp);
114    
115        free (from);        free (from);
116        free (subj);        free (subj);

Legend:
Removed from v.1.13  
changed lines
  Added in v.1.14

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