X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=00df99c9a332944d9edd2e70ca5a6ed50acbc189;hp=4d600f9cc0184986289ccb571d762f4688f1c732;hb=20e55d4252ca2db1fc2b1099acf8393c22903575;hpb=f435868132e200bfa71ac155f037cf64bf5414ba diff --git a/attach.c b/attach.c index 4d600f9..00df99c 100644 --- a/attach.c +++ b/attach.c @@ -255,7 +255,7 @@ static int is_mmnoask (const char *buf) if ((p = getenv ("MM_NOASK")) != NULL && *p) { if (m_strcmp(p, "1") == 0) - return (1); + return 1; m_strcpy(tmp, sizeof(tmp), p); p = tmp; @@ -264,22 +264,22 @@ static int is_mmnoask (const char *buf) if ((q = strrchr (p, '/')) != NULL) { if (*(q + 1) == '*') { if (ascii_strncasecmp (buf, p, q - p) == 0) - return (1); + return 1; } else { if (ascii_strcasecmp (buf, p) == 0) - return (1); + return 1; } } else { lng = m_strlen(p); if (buf[lng] == '/' && m_strncasecmp(buf, p, lng) == 0) - return (1); + return 1; } p = NULL; } } - return (0); + return 0; } void mutt_check_lookup_list (BODY * b, char *type, int len) @@ -701,14 +701,14 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags, if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL) { mutt_perror ("fopen"); - return (-1); + return -1; } fseeko ((s.fpin = fp), m->offset, 0); mutt_decode_attachment (m, &s); if (m_fclose(&s.fpout) != 0) { mutt_perror ("fclose"); - return (-1); + return -1; } } } else { @@ -718,13 +718,13 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags, if ((ofp = fopen (m->filename, "r")) == NULL) { mutt_perror ("fopen"); - return (-1); + return -1; } if ((nfp = mutt_save_attachment_open (path, flags)) == NULL) { mutt_perror ("fopen"); m_fclose(&ofp); - return (-1); + return -1; } if (mutt_copy_stream (ofp, nfp) == -1) { @@ -732,7 +732,7 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags, m_fclose(&ofp); m_fclose(&nfp); - return (-1); + return -1; } m_fclose(&ofp); m_fclose(&nfp); @@ -757,7 +757,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, int pathfd, if (s.fpout == NULL) { close(pathfd); mutt_perror ("fopen"); - return (-1); + return -1; } if (fp == NULL) { @@ -768,12 +768,12 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, int pathfd, if (stat (m->filename, &st) == -1) { mutt_perror ("stat"); m_fclose(&s.fpout); - return (-1); + return -1; } if ((s.fpin = fopen (m->filename, "r")) == NULL) { mutt_perror ("fopen"); - return (-1); + return -1; } saved_encoding = m->encoding; @@ -808,7 +808,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, int pathfd, m_fclose(&s.fpin); } - return (0); + return 0; } /* Ok, the difference between send and receive: @@ -867,7 +867,7 @@ int mutt_print_attachment (FILE * fp, BODY * a) if ((ifp = fopen (newfile, "r")) == NULL) { mutt_perror ("fopen"); rfc1524_entry_delete(&entry); - return (0); + return 0; } if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) { @@ -894,7 +894,7 @@ int mutt_print_attachment (FILE * fp, BODY * a) unlink (newfile); rfc1524_entry_delete(&entry); - return (1); + return 1; } tok = mime_which_token(type, -1); @@ -956,7 +956,7 @@ int mutt_attach_check (HEADER* hdr) { if (!hdr || !hdr->content || !((regex_t*) AttachRemindRegexp.rx) || (fp = safe_fopen (hdr->content->filename, "r")) == NULL) - return (0); + return 0; while (!found && fgets (buf, sizeof (buf), fp)) { p = buf; @@ -971,5 +971,5 @@ int mutt_attach_check (HEADER* hdr) { } m_fclose(&fp); - return (found); + return found; }