From 92f33a4a968296528f1d5f151ff700210840cb2c Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Sat, 28 Oct 2006 02:49:38 +0200 Subject: [PATCH] more fixes Signed-off-by: Pierre Habouzit --- buffer.c | 2 +- buffer.h | 2 +- muttlib.c | 10 ++------- parse.c | 58 ++++++++++++++++++++++++++-------------------------- pattern.c | 2 +- query.c | 2 +- recvattach.c | 2 +- send.c | 6 +++--- status.c | 3 ++- 9 files changed, 41 insertions(+), 46 deletions(-) diff --git a/buffer.c b/buffer.c index 8ca84c3..9bd412b 100644 --- a/buffer.c +++ b/buffer.c @@ -49,7 +49,7 @@ BUFFER *mutt_buffer_init (BUFFER * b) * Disregards the 'destroy' flag, which seems reserved for caller. * This is bad, but there's no apparent protocol for it. */ -BUFFER *mutt_buffer_from (BUFFER * b, char *seed) +BUFFER *mutt_buffer_from (BUFFER * b, const char *seed) { if (!seed) return NULL; diff --git a/buffer.h b/buffer.h index 29f201e..877b1ec 100644 --- a/buffer.h +++ b/buffer.h @@ -13,7 +13,7 @@ int mutt_extract_token (BUFFER *, BUFFER *, int); BUFFER *mutt_buffer_init (BUFFER *); -BUFFER *mutt_buffer_from (BUFFER *, char *); +BUFFER *mutt_buffer_from (BUFFER *, const char *); void mutt_buffer_free (BUFFER **); void mutt_buffer_add (BUFFER *, const char *, size_t); void mutt_buffer_addstr (BUFFER *, const char *); diff --git a/muttlib.c b/muttlib.c index 24f4ef3..9c835d1 100644 --- a/muttlib.c +++ b/muttlib.c @@ -1158,15 +1158,9 @@ FILE *mutt_open_read (const char *path, pid_t * thepid) *thepid = mutt_create_filter (s, NULL, &f, NULL); mem_free (&s); } else { - struct stat st; - - if (stat (path, &st) < 0) - return (NULL); - if (S_ISDIR (st.st_mode)) { - errno = EINVAL; - return (NULL); - } f = fopen (path, "r"); + if (!f) + return NULL; *thepid = -1; } diff --git a/parse.c b/parse.c index d623d44..5b88380 100644 --- a/parse.c +++ b/parse.c @@ -237,7 +237,7 @@ static PARAMETER *parse_parameters (const char *s) new->value = str_dup (buffer); - debug_print (2, ("`%s' = `%s'\n", new->attribute ? new->attribute : "", + debug_print (2, ("`%s' = `%s'\n", new->attribute ? new->attribute : "", new->value ? new->value : "")); /* Add this parameter to the list */ @@ -794,7 +794,7 @@ time_t mutt_parse_date (const char *s, HEADER * h) char scratch[SHORT_STRING]; /* Don't modify our argument. Fixed-size buffer is ok here since - * the date format imposes a natural limit. + * the date format imposes a natural limit. */ strfcpy (scratch, s, sizeof (scratch)); @@ -1070,9 +1070,9 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p, if (hdr) { hdr->lines = atoi (p); - /* + /* * HACK - mutt has, for a very short time, produced negative - * Lines header values. Ignore them. + * Lines header values. Ignore them. */ if (hdr->lines < 0) hdr->lines = 0; @@ -1289,14 +1289,14 @@ done: * f stream to read from * * hdr header structure of current message (optional). - * + * * user_hdrs If set, store user headers. Used for recall-message and * postpone modes. - * + * * weed If this parameter is set and the user has activated the * $weed option, honor the header weed list for user headers. * Used for recall-message. - * + * * Returns: newly allocated envelope structure. You should free it by * mutt_free_envelope() when envelope stay unneeded. */ @@ -1440,13 +1440,13 @@ ADDRESS *mutt_parse_adrlist (ADDRESS * p, const char *s) int count_body_parts_check(LIST **checklist, BODY *b, int dflt) { LIST *type; ATTACH_MATCH *a; - + /* If list is null, use default behavior. */ if (! *checklist) { /*return dflt;*/ return 0; } - + for (type = *checklist; type; type = type->next) { a = (ATTACH_MATCH *)type->data; debug_print(5, ("cbpc: %s %d/%s ?? %s/%s [%d]... ", @@ -1466,32 +1466,32 @@ int count_body_parts_check(LIST **checklist, BODY *b, int dflt) { #define AT_COUNT(why) { shallcount = 1; } #define AT_NOCOUNT(why) { shallcount = 0; } -int count_body_parts (BODY *body, int flags) { +int count_body_parts (BODY *body, int flags) { int count = 0; int shallcount, shallrecurse; BODY *bp; - + if (body == NULL) return 0; - + for (bp = body; bp != NULL; bp = bp->next) { /* Initial disposition is to count and not to recurse this part. */ AT_COUNT("default"); shallrecurse = 0; - + debug_print(5, ("bp: desc=\"%s\"; fn=\"%s\", type=\"%d/%s\"\n", bp->description ? bp->description : ("none"), bp->filename ? bp->filename : bp->d_filename ? bp->d_filename : "(none)", bp->type, bp->subtype ? bp->subtype : "*")); - + if (bp->type == TYPEMESSAGE) { shallrecurse = 1; - + /* If it's an external body pointer, don't recurse it. */ if (!ascii_strcasecmp (bp->subtype, "external-body")) shallrecurse = 0; - + /* Don't count containers if they're top-level. */ if (flags & M_PARTS_TOPLEVEL) AT_NOCOUNT("top-level message/*"); @@ -1500,19 +1500,19 @@ int count_body_parts (BODY *body, int flags) { shallrecurse = 1; if (!str_casecmp(bp->subtype, "alternative")) shallrecurse = 0; - + /* Don't count containers if they're top-level. */ if (flags & M_PARTS_TOPLEVEL) AT_NOCOUNT("top-level multipart"); } - + if (bp->disposition == DISPINLINE && bp->type != TYPEMULTIPART && bp->type != TYPEMESSAGE && bp == body) AT_NOCOUNT("ignore fundamental inlines"); - + /* If this body isn't scheduled for enumeration already, don't bother * profiling it further. */ - + if (shallcount) { /* Turn off shallcount if message type is not in ok list, * or if it is in except list. Check is done separately for @@ -1531,21 +1531,21 @@ int count_body_parts (BODY *body, int flags) { AT_NOCOUNT("excluded"); } } - + if (shallcount) count++; bp->attach_qualifies = shallcount ? 1 : 0; - - debug_print(5, ("cbp: %08x shallcount = %d\n", (unsigned int)bp, shallcount)); - + + debug_print(5, ("cbp: %p shallcount = %d\n", bp, shallcount)); + if (shallrecurse) { - debug_print(5, ("cbp: %08x pre count = %d\n", (unsigned int)bp, count)); + debug_print(5, ("cbp: %p pre count = %d\n", bp, count)); bp->attach_count = count_body_parts(bp->parts, flags & ~M_PARTS_TOPLEVEL); count += bp->attach_count; - debug_print(5, ("cbp: %08x post count = %d\n", (unsigned int)bp, count)); + debug_print(5, ("cbp: %p post count = %d\n", bp, count)); } } - + debug_print(5, ("bp: return %d\n", count < 0 ? 0 : count)); return count < 0 ? 0 : count; } @@ -1555,12 +1555,12 @@ int mutt_count_body_parts (HEADER *hdr, int flags) { return (0); if (hdr->attach_valid && !(flags & M_PARTS_RECOUNT)) return hdr->attach_total; - + if (AttachAllow || AttachExclude || InlineAllow || InlineExclude) hdr->attach_total = count_body_parts(hdr->content, flags | M_PARTS_TOPLEVEL); else hdr->attach_total = 0; - + hdr->attach_valid = 1; return hdr->attach_total; } diff --git a/pattern.c b/pattern.c index c30a381..c06f5f8 100644 --- a/pattern.c +++ b/pattern.c @@ -101,7 +101,7 @@ struct pattern_flags { '=', M_DUPLICATED, 0, NULL}, { '$', M_UNREFERENCED, 0, NULL}, { '*', M_REALNAME, 0, NULL}, { - 0} + 0, 0, 0, NULL} }; static pattern_t *SearchPattern = NULL; /* current search pattern */ diff --git a/query.c b/query.c index df02f4a..1443bac 100644 --- a/query.c +++ b/query.c @@ -45,7 +45,7 @@ static struct mapping_t QueryHelp[] = { {N_("Make Alias"), OP_CREATE_ALIAS}, {N_("Search"), OP_SEARCH}, {N_("Help"), OP_HELP}, - {NULL} + {NULL, OP_NULL} }; /* Variables for outsizing output format */ diff --git a/recvattach.c b/recvattach.c index 30bcb49..d0272e3 100644 --- a/recvattach.c +++ b/recvattach.c @@ -57,7 +57,7 @@ static struct mapping_t AttachHelp[] = { {N_("Pipe"), OP_PIPE}, {N_("Print"), OP_PRINT}, {N_("Help"), OP_HELP}, - {NULL} + {NULL, OP_NULL} }; static int mutt_extract_path (char *filename, char *path) diff --git a/send.c b/send.c index c3bc525..32370e3 100644 --- a/send.c +++ b/send.c @@ -178,7 +178,7 @@ static ADDRESS *find_mailing_lists (ADDRESS * t, ADDRESS * c) return top; } -static int edit_address (ADDRESS ** a, /* const */ char *field) +static int edit_address (ADDRESS ** a, const char *field) { char buf[HUGE_STRING]; char *err = NULL; @@ -1111,8 +1111,8 @@ int ci_send_message (int flags, /* send mode */ char *pgpkeylist = NULL; /* save current value of "pgp_sign_as" */ - char *signas = NULL; - char *tag = NULL, *err = NULL; + char *signas = NULL, *err = NULL; + const char *tag = NULL; char *ctype; int rv = -1; diff --git a/status.c b/status.c index 429a718..aa94a86 100644 --- a/status.c +++ b/status.c @@ -62,7 +62,8 @@ static const char *status_format_str (char *buf, size_t buflen, char op, const char *elsestring, unsigned long data, format_flag flags) { - char fmt[SHORT_STRING], tmp[SHORT_STRING], *cp, *p; + char fmt[SHORT_STRING], tmp[SHORT_STRING]; + const char *cp, *p; int count, optional = (flags & M_FORMAT_OPTIONAL); MUTTMENU *menu = (MUTTMENU *) data; -- 2.20.1