X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fdistsbr.c;h=2662c02dd9184c64d7f13f9f8b9271e415fb9b86;hp=058875c571452b7d0df4665c8623cfd0e76bd102;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=1646b692af15ca4aac6d2c77fa72f63a18515215 diff --git a/uip/distsbr.c b/uip/distsbr.c index 058875c..2662c02 100644 --- a/uip/distsbr.c +++ b/uip/distsbr.c @@ -35,20 +35,23 @@ distout(char *drft, char *msgnam, char *backup) advise(backup, "unable to rename %s to",drft); return NOTOK; } + + if (ready_msg(msgnam) != OK) { + return NOTOK; + } + if (!(ifp = fopen(backup, "r"))) { advise(backup, "unable to read"); return NOTOK; } if (!(ofp = fopen(drft, "w"))) { + fclose(ifp); advise(drft, "unable to create temporary file"); return NOTOK; } chmod(drft, m_gmprot()); - if (ready_msg(msgnam) != OK) { - return NOTOK; - } lseek(hdrfd, (off_t) 0, SEEK_SET); /* msgnam not accurate */ cpydata(hdrfd, fileno(ofp), msgnam, drft); @@ -144,12 +147,14 @@ ready_msg(char *msgnam) cp = m_mktemp2(NULL, "dist", &hdrfd, NULL); if (!cp) { + fclose(ifp); advise("distsbr", "unable to create temporary file"); return NOTOK; } fchmod(hdrfd, 0600); strncpy(tmpfil, cp, sizeof(tmpfil)); if ((out = dup(hdrfd)) == NOTOK || !(ofp = fdopen(out, "w"))) { + fclose(ifp); advise(NULL, "no file descriptors -- you lose big"); return NOTOK; }