From 1fa130754f837e514e7eb231f4e0c6e1b1419271 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sun, 30 Dec 2012 14:52:15 +0200 Subject: Check returns from pipe, dup2 and chmod. Don't use obsolete MU functions. --- src/directive.c | 7 +++++- src/exec.c | 23 ++++++++++++++----- src/mail.c | 68 +++++++++++++++++++-------------------------------------- src/triplet.c | 2 -- src/wydawca.h | 2 ++ 5 files changed, 49 insertions(+), 53 deletions(-) (limited to 'src') diff --git a/src/directive.c b/src/directive.c index 8893675..cb656e7 100644 --- a/src/directive.c +++ b/src/directive.c @@ -488,7 +488,12 @@ run_check_script (const char *script, struct file_triplet *trp, setenv ("WYDAWCA_TRIPLET_BASE", trp->name, 1); setenv ("WYDAWCA_DIST_FILE", trp->file[file_dist].name, 1); - chdir (temp_homedir); + if (chdir (temp_homedir)) + { + logmsg (LOG_CRIT, "cannot change to %s: %s", + temp_homedir, strerror (errno)); + _exit (127); + } argv[0] = "sh"; argv[1] = script_file; diff --git a/src/exec.c b/src/exec.c index e92fe17..9af6de2 100644 --- a/src/exec.c +++ b/src/exec.c @@ -30,16 +30,29 @@ start_prog (int argc, const char **argv, pid_t *ppid) pid_t pid; int i; - pipe (p); + if (pipe (p)) + { + logmsg (LOG_CRIT, "pipe: %s", strerror (errno)); + return NULL; + } + switch (pid = fork ()) { case 0: /* Child process */ - if (p[1] != 1) - dup2 (p[1], 1); - if (p[1] != 1) - dup2 (p[1], 2); + if (p[1] != 1 && dup2 (p[1], 1) == -1) + { + logmsg (LOG_CRIT, "dup2: %s", strerror (errno)); + _exit (EX_UNAVAILABLE); + } + + if (p[1] != 1 && dup2 (p[1], 2) == -1) + { + logmsg (LOG_CRIT, "dup2: %s", strerror (errno)); + _exit (EX_UNAVAILABLE); + } + close (p[0]); /* Close unneded descripitors */ diff --git a/src/mail.c b/src/mail.c index c2e92f9..270c2f5 100644 --- a/src/mail.c +++ b/src/mail.c @@ -273,8 +273,6 @@ mail_send_message (mu_address_t rcpt, const char *text, mu_stream_t stream = NULL; mu_header_t hdr; static char *x_mailer = "wydawca (" PACKAGE_STRING ")"; - size_t size; - char *buf; const char *sval; mu_static_memory_stream_create (&stream, text, strlen (text)); @@ -290,20 +288,15 @@ mail_send_message (mu_address_t rcpt, const char *text, if (rcpt) { - mu_address_to_string (rcpt, NULL, 0, &size); - buf = grecs_malloc (size + 1); - mu_address_to_string (rcpt, buf, size + 1, NULL); - - mu_header_set_value (hdr, "To", buf, 1); - free (buf); - + const char *s; + + if (mu_address_sget_printable (rcpt, &s) == 0) + mu_header_set_value (hdr, "To", s, 1); + if (from_address && mu_header_sget_value (hdr, "From", &sval)) { - mu_address_to_string (from_address, NULL, 0, &size); - buf = grecs_malloc (size + 1); - mu_address_to_string (from_address, buf, size + 1, NULL); - mu_header_set_value (hdr, "From", buf, 1); - free (buf); + if (mu_address_sget_printable (from_address, &s) == 0) + mu_header_set_value (hdr, "From", s, 1); } } @@ -431,13 +424,10 @@ mail_stats () if (debug_level) { - size_t size; - char *buf; - mu_address_to_string (admin_address, NULL, 0, &size); - buf = grecs_malloc (size + 1); - mu_address_to_string (admin_address, buf, size + 1, NULL); - logmsg (LOG_DEBUG, _("sending stats to %s"), buf); - free (buf); + const char *s; + + if (mu_address_sget_printable (admin_address, &s) == 0) + logmsg (LOG_DEBUG, _("sending stats to %s"), s); } tc = timer_get_count () * 3; @@ -595,14 +585,11 @@ do_notify (struct file_triplet *trp, enum notification_event ev, { if (rcpt) { - size_t size; - char *buf; - mu_address_to_string (rcpt, NULL, 0, &size); - buf = grecs_malloc (size + 1); - mu_address_to_string (rcpt, buf, size + 1, NULL); - logmsg (LOG_DEBUG, _("notifying %s (project %s) about %s"), - buf, trp->project, notification_event_str (ev)); - free (buf); + const char *s; + + if (mu_address_sget_printable (rcpt, &s) == 0) + logmsg (LOG_DEBUG, _("notifying %s (project %s) about %s"), + s, trp->project, notification_event_str (ev)); } else logmsg (LOG_DEBUG, @@ -638,14 +625,8 @@ notify (struct notification *notification_list, const char * expand_email_admin (struct metadef *def, void *data) { - size_t size; - if (mu_address_to_string (admin_address, NULL, 0, &size) == 0) - { - size++; - def->storage = grecs_malloc (size); - mu_address_to_string (admin_address, def->storage, size, NULL); - def->value = def->storage; - } + if (mu_address_aget_printable (admin_address, &def->storage) == 0) + def->value = def->storage; else def->value = ""; return def->value; @@ -657,7 +638,6 @@ expand_email_owner (struct metadef *def, void *data) struct file_triplet *trp = data; mu_address_t addr; const char *errp; - size_t size; addr = get_recipient (trp->spool->dictionary[project_owner_dict], trp, &errp); @@ -667,16 +647,14 @@ expand_email_owner (struct metadef *def, void *data) trp->project, gettext (errp)); def->value = ""; } - else if (mu_address_to_string (addr, NULL, 0, &size) == 0) + else { - size++; - def->storage = grecs_malloc (size); - mu_address_to_string (addr, def->storage, size, NULL); - def->value = def->storage; + if (mu_address_aget_printable (addr, &def->storage) == 0) + def->value = def->storage; + else + def->value = ""; mu_address_destroy (&addr); } - else - def->value = ""; return def->value; } diff --git a/src/triplet.c b/src/triplet.c index 14182be..a327b43 100644 --- a/src/triplet.c +++ b/src/triplet.c @@ -328,8 +328,6 @@ remove_triplet (struct file_triplet *trp) time_t triplet_sweep (void) { - struct file_triplet const *tp; - while (triplet_list && triplet_expired_p (triplet_list)) remove_triplet (triplet_list); diff --git a/src/wydawca.h b/src/wydawca.h index 25153c2..a150595 100644 --- a/src/wydawca.h +++ b/src/wydawca.h @@ -428,6 +428,8 @@ int spool_cwd_add_new_file (const struct spool *spool, const char *name, int spool_open_dictionaries (struct spool *spool); void spool_close_dictionaries (struct spool *spool); +void parse_file_name (const char *name, struct file_info *finfo); +void file_info_cleanup (struct file_info *finfo); int for_each_spool (int (*fun) (struct spool *, void *), void *data); void register_spool (struct spool *spool); struct spool *wydawca_find_spool (const char *name); -- cgit v1.2.1