]>
Commit | Line | Data |
---|---|---|
f9dda27f JR |
1 | --- alpine-0.9999/imap/src/osdep/unix/unix.c~ 2007-08-31 02:50:06.000000000 +0200 |
2 | +++ alpine-0.9999/imap/src/osdep/unix/unix.c 2007-11-05 14:40:33.000000000 +0100 | |
3 | @@ -329,7 +329,7 @@ | |
4 | int i,fd; | |
5 | time_t ti = time (0); | |
6 | if (!(s = dummy_file (mbx,mailbox))) { | |
7 | - sprintf (tmp,"Can't create %.80s: invalid name",mailbox); | |
8 | + snprintf (tmp,MAILTMPLEN,"Can't create %.80s: invalid name",mailbox); | |
9 | MM_LOG (tmp,ERROR); | |
10 | } | |
11 | /* create underlying file */ | |
12 | @@ -339,25 +339,25 @@ | |
13 | mail_parameters (NIL,GET_USERHASNOLIFE,NIL)) ret = T; | |
14 | else if ((fd = open (mbx,O_WRONLY, | |
15 | (long) mail_parameters (NIL,GET_MBXPROTECTION,NIL))) < 0) { | |
16 | - sprintf (tmp,"Can't reopen mailbox node %.80s: %s",mbx,strerror (errno)); | |
17 | + snprintf (tmp,MAILTMPLEN,"Can't reopen mailbox node %.80s: %s",mbx,strerror (errno)); | |
18 | MM_LOG (tmp,ERROR); | |
19 | unlink (mbx); /* delete the file */ | |
20 | } | |
21 | else { /* initialize header */ | |
22 | memset (tmp,'\0',MAILTMPLEN); | |
23 | - sprintf (tmp,"From %s %sDate: ",pseudo_from,ctime (&ti)); | |
24 | + snprintf (tmp,MAILTMPLEN,"From %s %sDate: ",pseudo_from,ctime (&ti)); | |
25 | rfc822_fixed_date (s = tmp + strlen (tmp)); | |
26 | /* write the pseudo-header */ | |
27 | - sprintf (s += strlen (s), | |
28 | + snprintf (s += strlen (s),MAILTMPLEN, | |
29 | "\nFrom: %s <%s@%s>\nSubject: %s\nX-IMAP: %010lu 0000000000", | |
30 | pseudo_name,pseudo_from,mylocalhost (),pseudo_subject, | |
31 | (unsigned long) ti); | |
32 | for (i = 0; i < NUSERFLAGS; ++i) if (default_user_flag (i)) | |
33 | - sprintf (s += strlen (s)," %s",default_user_flag (i)); | |
34 | - sprintf (s += strlen (s),"\nStatus: RO\n\n%s\n\n",pseudo_msg); | |
35 | + snprintf (s += strlen (s),MAILTMPLEN," %s",default_user_flag (i)); | |
36 | + snprintf (s += strlen (s),MAILTMPLEN,"\nStatus: RO\n\n%s\n\n",pseudo_msg); | |
37 | if (write (fd,tmp,strlen (tmp)) > 0) ret = T; | |
38 | else { | |
39 | - sprintf (tmp,"Can't initialize mailbox node %.80s: %s",mbx, | |
40 | + snprintf (tmp,MAILTMPLEN,"Can't initialize mailbox node %.80s: %s",mbx, | |
41 | strerror (errno)); | |
42 | MM_LOG (tmp,ERROR); | |
43 | unlink (mbx); /* delete the file */ |