aboutsummaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-10-29 13:16:28 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-10-29 13:16:28 +0000
commit31d58e58d2ceea6c0a8e1e652384f1643685e5af (patch)
tree6a5b29f66276edbe6161a511e956407515574e88 /networking
parent1fe7887659353f43e6cdd1a2492178e11a7ee6d5 (diff)
downloadbusybox-w32-31d58e58d2ceea6c0a8e1e652384f1643685e5af.tar.gz
busybox-w32-31d58e58d2ceea6c0a8e1e652384f1643685e5af.tar.bz2
busybox-w32-31d58e58d2ceea6c0a8e1e652384f1643685e5af.zip
randomconfig fixes
Diffstat (limited to 'networking')
-rw-r--r--networking/sendmail.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/networking/sendmail.c b/networking/sendmail.c
index ef6e03be6..9602b89ec 100644
--- a/networking/sendmail.c
+++ b/networking/sendmail.c
@@ -261,11 +261,15 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
261 OPT_N = 1 << 4, // request notification 261 OPT_N = 1 << 4, // request notification
262 OPT_f = 1 << 5, // sender address 262 OPT_f = 1 << 5, // sender address
263 OPT_F = 1 << 6, // sender name, overrides $NAME 263 OPT_F = 1 << 6, // sender name, overrides $NAME
264#if ENABLE_FEATURE_SENDMAIL_MAILX
264 OPT_s = 1 << 7, // subject 265 OPT_s = 1 << 7, // subject
265 OPT_j = 1 << 8, // assumed charset 266 OPT_j = 1 << 8, // assumed charset
266 OPT_a = 1 << 9, // attachment(s) 267 OPT_a = 1 << 9, // attachment(s)
268#if ENABLE_FEATURE_SENDMAIL_MAILXX
267 OPT_c = 1 << 10, // carbon copy 269 OPT_c = 1 << 10, // carbon copy
268 OPT_e = 1 << 11, // errors-to address 270 OPT_e = 1 << 11, // errors-to address
271#endif
272#endif
269 }; 273 };
270 274
271 // init global variables 275 // init global variables
@@ -405,10 +409,12 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
405 } else if (0 == strncmp("Subject: ", s, 9)) { 409 } else if (0 == strncmp("Subject: ", s, 9)) {
406 // we read subject -> use it verbatim unless it is specified 410 // we read subject -> use it verbatim unless it is specified
407 // on command line 411 // on command line
408 if (!(opts & OPT_s)) 412#if ENABLE_FEATURE_SENDMAIL_MAILX
409 llist_add_to_end(&headers, s); 413 if (opts & OPT_s)
410 else
411 free(s); 414 free(s);
415 else
416#endif
417 llist_add_to_end(&headers, s);
412 } else if (s[0]) { 418 } else if (s[0]) {
413 // misc header 419 // misc header
414 llist_add_to_end(&headers, s); 420 llist_add_to_end(&headers, s);
@@ -430,6 +436,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
430 } 436 }
431 437
432 // put (possibly encoded) subject 438 // put (possibly encoded) subject
439#if ENABLE_FEATURE_SENDMAIL_MAILX
433 if (opts & OPT_j) 440 if (opts & OPT_j)
434 sane((char *)opt_charset); 441 sane((char *)opt_charset);
435 if (opts & OPT_s) { 442 if (opts & OPT_s) {
@@ -443,6 +450,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
443 } 450 }
444 printf("\r\n"); 451 printf("\r\n");
445 } 452 }
453#endif
446 454
447 // put sender name, $NAME is the default 455 // put sender name, $NAME is the default
448 if (!(opts & OPT_F)) 456 if (!(opts & OPT_F))