/* Find ~/.netrc. */
if (!processed_netrc)
{
- char *home = home_dir();
+ char *home = home_dir ();
netrc_list = NULL;
processed_netrc = 1;
#ifdef STANDALONE
+
+#include <assert.h>
+
/* Normally, these functions would be defined by your package. */
# define xmalloc malloc
# define xfree free
# define xstrdup strdup
-/* The function reads a whole line. It reads the line realloc-ing the
+# define xrealloc realloc
+
+/* Read a line from FP. The function reallocs the storage as needed
+ to accomodate for any length of the line. Reallocs are done
storage exponentially, doubling the storage after each overflow to
- minimize the number of calls to realloc().
+ minimize the number of calls to realloc() and fgets(). The newline
+ character at the end of line is retained.
- It is not an exemplary of correctness, since it kills off the
- newline (and no, there is no way to know if there was a newline at
- EOF). */
-# define xrealloc realloc
-# define DYNAMIC_LINE_BUFFER 40
+ After end-of-file is encountered without anything being read, NULL
+ is returned. NULL is also returned on error. To distinguish
+ between these two cases, use the stdio function ferror(). */
char *
read_whole_line (FILE *fp)
{
- char *line;
- int i, bufsize, c;
-
- i = 0;
- bufsize = DYNAMIC_LINE_BUFFER;
- line = xmalloc(bufsize);
- /* Construct the line. */
- while ((c = getc(fp)) != EOF && c != '\n')
+ int length = 0;
+ int bufsize = 81;
+ char *line = (char *)xmalloc (bufsize);
+
+ while (fgets (line + length, bufsize - length, fp))
{
- if (i > bufsize - 1)
- line = (char *)xrealloc(line, (bufsize <<= 1));
- line[i++] = c;
+ length += strlen (line + length);
+ assert (length > 0);
+ if (line[length - 1] == '\n')
+ break;
+ /* fgets() guarantees to read the whole line, or to use up the
+ space we've given it. We can double the buffer
+ unconditionally. */
+ bufsize <<= 1;
+ line = xrealloc (line, bufsize);
}
- if (c == EOF && !i)
+ if (length == 0 || ferror (fp))
{
- xfree(line);
+ xfree (line);
return NULL;
}
-
- /* Check for overflow at zero-termination (no need to double the
- buffer in this case. */
- if (i == bufsize)
- line = (char *)xrealloc(line, i + 1);
- line[i] = '\0';
+ if (length + 1 < bufsize)
+ /* Relieve the memory from our exponential greediness. We say
+ `length + 1' because the terminating \0 is not included in
+ LENGTH. We don't need to zero-terminate the string ourselves,
+ though, because fgets() does that. */
+ line = xrealloc (line, length + 1);
return line;
}
-
#endif /* STANDALONE */
/* Maybe add NEWENTRY to the account information list, LIST. NEWENTRY is