changeset: 6304:4c5163272b9c
user: Michael Elkins <[email protected]>
date: Thu Apr 11 02:17:41 2013 +0000
link: http://dev.mutt.org/hg/mutt/rev/4c5163272b9c
backout c1371176ea45
diffs (313 lines):
diff -r f99e91980f0f -r 4c5163272b9c browser.c
--- a/browser.c Thu Apr 11 01:59:26 2013 +0000
+++ b/browser.c Thu Apr 11 02:17:41 2013 +0000
@@ -615,11 +615,7 @@
}
else
{
- if (getcwd (LastDir, sizeof (LastDir)) == NULL)
- {
- dprint(1, (debugfile, "%s:%d getcwd() returned NULL\n", __FILE__,
__LINE__));
- LastDir[0] = '\0';
- }
+ getcwd (LastDir, sizeof (LastDir));
safe_strcat (LastDir, sizeof (LastDir), "/");
safe_strncat (LastDir, sizeof (LastDir), f, i);
}
@@ -629,13 +625,7 @@
if (f[0] == '/')
strcpy (LastDir, "/"); /* __STRCPY_CHECKED__ */
else
- {
- if (getcwd (LastDir, sizeof (LastDir)) == NULL)
- {
- dprint(1, (debugfile, "%s:%d getcwd() returned NULL\n", __FILE__,
__LINE__));
- LastDir[0] = '\0';
- }
- }
+ getcwd (LastDir, sizeof (LastDir));
}
if (i <= 0 && f[0] != '/')
@@ -650,13 +640,7 @@
else
{
if (!folder)
- {
- if (getcwd (LastDir, sizeof (LastDir)) == NULL)
- {
- dprint(1, (debugfile, "%s:%d getcwd() returned NULL\n", __FILE__,
__LINE__));
- LastDir[0] = '\0';
- }
- }
+ getcwd (LastDir, sizeof (LastDir));
else if (!LastDir[0])
strfcpy (LastDir, NONULL(Maildir), sizeof (LastDir));
@@ -675,13 +659,7 @@
while (i && LastDir[--i] == '/')
LastDir[i] = '\0';
if (!LastDir[0])
- {
- if (getcwd (LastDir, sizeof (LastDir)) == NULL)
- {
- dprint(1, (debugfile, "%s:%d getcwd() returned NULL\n", __FILE__,
__LINE__));
- LastDir[0] = '\0';
- }
- }
+ getcwd (LastDir, sizeof (LastDir));
}
}
diff -r f99e91980f0f -r 4c5163272b9c enter.c
--- a/enter.c Thu Apr 11 01:59:26 2013 +0000
+++ b/enter.c Thu Apr 11 02:17:41 2013 +0000
@@ -28,7 +28,6 @@
#include "history.h"
#include <string.h>
-#include <errno.h>
/* redraw flags for mutt_enter_string() */
enum
@@ -95,8 +94,7 @@
/* If this works, we can stop now */
if (dlen >= MB_LEN_MAX) {
- if (wcrtomb (dest, 0, &st) == (size_t) -1)
- dprint(1, (debugfile, "%s:%d wcrtomb() returned -1, errno=%d\n",
__FILE__, __LINE__, errno));
+ wcrtomb (dest, 0, &st);
return;
}
diff -r f99e91980f0f -r 4c5163272b9c imap/message.c
--- a/imap/message.c Thu Apr 11 01:59:26 2013 +0000
+++ b/imap/message.c Thu Apr 11 02:17:41 2013 +0000
@@ -561,13 +561,11 @@
}
h->lines = 0;
- if (fgets (buf, sizeof (buf), msg->fp) == NULL)
- ; /* EOF checked below */
+ fgets (buf, sizeof (buf), msg->fp);
while (!feof (msg->fp))
{
h->lines++;
- if (fgets (buf, sizeof (buf), msg->fp) == NULL)
- ; /* EOF checked in while loop condition */
+ fgets (buf, sizeof (buf), msg->fp);
}
h->content->length = ftell (msg->fp) - h->content->offset;
diff -r f99e91980f0f -r 4c5163272b9c init.c
--- a/init.c Thu Apr 11 01:59:26 2013 +0000
+++ b/init.c Thu Apr 11 02:17:41 2013 +0000
@@ -2822,6 +2822,7 @@
#ifdef DEBUG
static void start_debug (void)
{
+ time_t t;
int i;
char buf[_POSIX_PATH_MAX];
char buf2[_POSIX_PATH_MAX];
@@ -2835,6 +2836,7 @@
}
if ((debugfile = safe_fopen(buf, "w")) != NULL)
{
+ t = time (0);
setbuf (debugfile, NULL); /* don't buffer the debugging output! */
dprint(1,(debugfile,"Mutt/%s (%s) debugging at level %d\n",
MUTT_VERSION, ReleaseDate, debuglevel));
diff -r f99e91980f0f -r 4c5163272b9c mbox.c
--- a/mbox.c Thu Apr 11 01:59:26 2013 +0000
+++ b/mbox.c Thu Apr 11 02:17:41 2013 +0000
@@ -968,11 +968,7 @@
if (i == 0)
{
ctx->size = ftello (ctx->fp); /* update the size of the mailbox */
- if (ftruncate (fileno (ctx->fp), ctx->size) == -1)
- {
- dprint(1, (debugfile, "%s:%d ftrunctate() returned -1, errno=%d\n",
__FILE__, __LINE__, errno));
- i = -1;
- }
+ ftruncate (fileno (ctx->fp), ctx->size);
}
}
diff -r f99e91980f0f -r 4c5163272b9c muttlib.c
--- a/muttlib.c Thu Apr 11 01:59:26 2013 +0000
+++ b/muttlib.c Thu Apr 11 02:17:41 2013 +0000
@@ -67,7 +67,6 @@
char buf[_POSIX_PATH_MAX];
char tmp[_POSIX_PATH_MAX];
char *period;
- char *r;
size_t sl;
struct stat sb;
@@ -76,9 +75,7 @@
if (s[0] == '\0')
{
snprintf (s, l, "%s/muttXXXXXX", buf);
- r = mktemp (s);
- if (*r == '\0')
- dprint (1, (debugfile, "%s:%d mktemp returned an empty string
(errno=%d)\n", __FILE__, __LINE__, errno));
+ mktemp (s);
}
else
{
@@ -90,9 +87,7 @@
if ((period = strrchr (tmp, '.')) != NULL)
*period = 0;
snprintf (s, l, "%s/%s.XXXXXX", buf, tmp);
- r = mktemp (s);
- if (*r == '\0')
- dprint (1, (debugfile, "%s:%d mktemp returned an empty string
(errno=%d)\n", __FILE__, __LINE__, errno));
+ mktemp (s);
if (period != NULL)
{
*period = '.';
diff -r f99e91980f0f -r 4c5163272b9c mx.c
--- a/mx.c Thu Apr 11 01:59:26 2013 +0000
+++ b/mx.c Thu Apr 11 02:17:41 2013 +0000
@@ -379,7 +379,6 @@
}
else if (st.st_size == 0)
{
-zero_size_file:
/* hard to tell what zero-length files are, so assume the default magic */
if (DefaultMagic == M_MBOX || DefaultMagic == M_MMDF)
return (DefaultMagic);
@@ -390,12 +389,7 @@
{
struct utimbuf times;
- if (fgets (tmp, sizeof (tmp), f) == NULL)
- {
- /* This situation should not occur since we check for size==0 above.. */
- dprint(1, (debugfile, "%s:%d fgets() returned NULL. this should not
happen!\n", __FILE__, __LINE__));
- goto zero_size_file;
- }
+ fgets (tmp, sizeof (tmp), f);
if (mutt_strncmp ("From ", tmp, 5) == 0)
magic = M_MBOX;
else if (mutt_strcmp (MMDF_SEP, tmp) == 0)
diff -r f99e91980f0f -r 4c5163272b9c pop.c
--- a/pop.c Thu Apr 11 01:59:26 2013 +0000
+++ b/pop.c Thu Apr 11 02:17:41 2013 +0000
@@ -67,7 +67,6 @@
long length;
char buf[LONG_STRING];
char tempfile[_POSIX_PATH_MAX];
- int rv;
mutt_mktemp (tempfile, sizeof (tempfile));
if (!(f = safe_fopen (tempfile, "w+")))
@@ -80,8 +79,7 @@
ret = pop_query (pop_data, buf, sizeof (buf));
if (ret == 0)
{
- if ((rv = sscanf (buf, "+OK %d %ld", &index, &length)) < 2)
- dprint(1, (debugfile, "%s:%d sscanf() returned %d\n", __FILE__,
__LINE__, rv));
+ sscanf (buf, "+OK %d %ld", &index, &length);
snprintf (buf, sizeof (buf), "TOP %d 0\r\n", h->refno);
ret = pop_fetch_data (pop_data, buf, NULL, fetch_message, f);
@@ -112,21 +110,12 @@
{
rewind (f);
h->env = mutt_read_rfc822_header (f, h, 0, 0);
- /*
- * The following code seems to be trying to alter the content length by
- * removing the CR characters for the header. Note that this value is
- * still incorrect, since "TOP 0" only returns the message header, so it
- * only ends up accounting for the CR characters in the header. The
- * correct length is set when the entire message is downloaded by
- * pop_fetch_message().
- */
h->content->length = length - h->content->offset + 1;
rewind (f);
while (!feof (f))
{
h->content->length--;
- if (fgets (buf, sizeof (buf), f) == NULL)
- ; /* EOF checked in while loop condition */
+ fgets (buf, sizeof (buf), f);
}
break;
}
@@ -649,13 +638,11 @@
h->data = uidl;
h->lines = 0;
- if (fgets (buf, sizeof (buf), msg->fp) == NULL)
- ; /* EOF checked in following while loop condition */
+ fgets (buf, sizeof (buf), msg->fp);
while (!feof (msg->fp))
{
ctx->hdrs[msgno]->lines++;
- if (fgets (buf, sizeof (buf), msg->fp) == NULL)
- ; /* EOF checked in following while loop condition */
+ fgets (buf, sizeof (buf), msg->fp);
}
h->content->length = ftello (msg->fp) - h->content->offset;
diff -r f99e91980f0f -r 4c5163272b9c query.c
--- a/query.c Thu Apr 11 01:59:26 2013 +0000
+++ b/query.c Thu Apr 11 02:17:41 2013 +0000
@@ -93,12 +93,7 @@
}
if (!quiet)
mutt_message _("Waiting for response...");
- if (fgets (msg, sizeof (msg), fp) == NULL)
- {
- dprint(1, (debugfile, "%s:%d query_command produced no output (fgets()
returned NULL)\n", __FILE__, __LINE__));
- return 0;
- }
-
+ fgets (msg, sizeof (msg), fp);
if ((p = strrchr (msg, '\n')))
*p = '\0';
while ((buf = mutt_read_line (buf, &buflen, fp, &dummy, 0)) != NULL)
diff -r f99e91980f0f -r 4c5163272b9c smime.c
--- a/smime.c Thu Apr 11 01:59:26 2013 +0000
+++ b/smime.c Thu Apr 11 02:17:41 2013 +0000
@@ -391,24 +391,8 @@
while (!feof(index)) {
numFields = fscanf (index, MUTT_FORMAT(STRING) " %x.%i "
MUTT_FORMAT(STRING), fields[0], &hash,
&hash_suffix, fields[2]);
- /*
- * ensure good values for these fields since they may not be set if
- * `public` is false, and they are used below.
- */
- fields[3][0] = '\0';
- fields[4][0] = '\0';
if (public)
- {
- /*
- * The original code here did not check the return value of fscanf,
- * so I'm unsure whether the entire line should be ignored upon
- * error. Just log it for now.
- */
- int rv;
- rv = fscanf (index, MUTT_FORMAT(STRING) " " MUTT_FORMAT(STRING)
"\n", fields[3], fields[4]);
- if (rv < 2)
- dprint (1, (debugfile, "%s:%d fscanf() returned %d\n", __FILE__,
__LINE__, errno));
- }
+ fscanf (index, MUTT_FORMAT(STRING) " " MUTT_FORMAT(STRING) "\n",
fields[3], fields[4]);
/* 0=email 1=name 2=nick 3=intermediate 4=trust */
if (numFields < 2) continue;
diff -r f99e91980f0f -r 4c5163272b9c system.c
--- a/system.c Thu Apr 11 01:59:26 2013 +0000
+++ b/system.c Thu Apr 11 02:17:41 2013 +0000
@@ -92,8 +92,7 @@
close (1);
close (2);
#endif
- if (chdir ("/") == -1)
- _exit (127);
+ chdir ("/");
act.sa_handler = SIG_DFL;
sigaction (SIGCHLD, &act, NULL);
break;
