xemacs-beta: lib-src/fakemail.c comparison

comparison lib-src/fakemail.c @ 398:74fd4e045ea6 r21-2-29

Import from CVS: tag r21-2-29

author	cvs
date	Mon, 13 Aug 2007 11:13:30 +0200
parents	6719134a07c2
children	de805c49cfc1

comparison

equal deleted inserted replaced

-:f4aeb21a5bad
+:74fd4e045ea6
 Boston, MA 02111-1307, USA.  */
 /* Synched up with: FSF 19.28. */
 #define NO_SHORTNAMES
-#include <../src/config.h>
+#include <config.h>
 #if defined (BSD) && !defined (BSD4_1) && !defined (USE_FAKEMAIL)
 /* This program is not used in BSD, so just avoid loader complaints.  */
 int
 main (int argc, char *argv[])
 * and works regardless of the length of the line.
 */
 struct linebuffer
 {
-long size;
+size_t size;
 char *buffer;
 };
 struct linebuffer lb;
 #ifndef MAIL_PROGRAM_NAME
 #define MAIL_PROGRAM_NAME "/bin/mail"
 #endif
-static CONST char *my_name;
+static const char *my_name;
 static char *the_date;
 static char *the_user;
 static line_list file_preface;
 static stream_list the_streams;
 static boolean no_problems = true;
 #ifdef CURRENT_USER
 extern struct passwd *getpwuid ();
 extern unsigned short geteuid ();
 static struct passwd *my_entry;
 #define cuserid(s)				\
-(my_entry = getpwuid (((int) geteuid ())),	\
+(my_entry = getpwuid ((int) geteuid ()),	\
 my_entry->pw_name)
 #endif
 /* Utilities */
 /* Print error message.  `s1' is printf control string, `s2' is arg for it. */
 static void
-error (CONST char *s1, CONST char *s2)
+error (const char *s1, const char *s2)
 {
 printf ("%s: ", my_name);
 printf (s1, s2);
 printf ("\n");
 no_problems = false;
 }
 /* Print error message and exit.  */
 static void
-fatal (CONST char *s1, CONST char *s2)
+fatal (const char *s1, const char *s2)
 {
 error (s1, s2);
 exit (1);
 }
 /* Like malloc but get fatal error if memory is exhausted.  */
-static char *
+static void *
 xmalloc (size_t size)
 {
-char *result = malloc (((unsigned) size));
+void *result = malloc (size);
-if (result == ((char *) NULL))
+if (result == NULL)
 fatal ("virtual memory exhausted", (char *) 0);
 return result;
 }
-static char *
+static void *
-xrealloc (char *ptr, size_t size)
+xrealloc (void *ptr, size_t size)
 {
-char *result = realloc (ptr, ((unsigned) size));
+void *result = realloc (ptr, size);
-if (result == ((char *) NULL))
+if (result == NULL)
 fatal ("virtual memory exhausted", (char *) 0);
 return result;
 }
 /* Initialize a linebuffer for use */
 static void
 init_linebuffer (struct linebuffer *linebuffer)
 {
 linebuffer->size = INITIAL_LINE_SIZE;
-linebuffer->buffer = ((char *) xmalloc (INITIAL_LINE_SIZE));
+linebuffer->buffer = (char *) xmalloc (INITIAL_LINE_SIZE);
 }
 /* Read a line of text from `stream' into `linebuffer'.
 * Return the length of the line.
 */
 {
 int c = getc (stream);
 if (p == end)
 	{
 	  linebuffer->size *= 2;
-	  buffer = ((char *) xrealloc ((char *) buffer,
+	  buffer = (char *) xrealloc (buffer, linebuffer->size);
-				       (size_t) (linebuffer->size)));
 	  p = buffer + (p - linebuffer->buffer);
 	  end = buffer + linebuffer->size;
 	  linebuffer->buffer = buffer;
 	}
 if (c < 0 || c == '\n')
 static boolean
 has_keyword (char *field)
 {
 char *ignored;
-return (get_keyword (field, &ignored) != ((char *) NULL));
+return (get_keyword (field, &ignored) != (char *) NULL);
 }
 static char *
 add_field (line_list the_list, register char *field, register char *where)
 {
 time (&idiotic_interface);
 the_date = ctime (&idiotic_interface);
 /* the_date has an unwanted newline at the end */
 date_length = strlen (the_date) - 1;
 the_date[date_length] = '\0';
+#ifdef WINDOWSNT
+temp = "(null)";
+#else
 temp = cuserid ((char *) NULL);
+#endif
 user_length = strlen (temp);
 the_user = alloc_string ((size_t) (user_length + 1));
 strcpy (the_user, temp);
 the_string = alloc_string ((size_t) (3 + prefix_length +
 				       user_length +
 {
 FILE *the_stream = fopen (name, "a");
 if (the_stream != ((FILE *) NULL))
 {
 add_a_stream (the_stream, my_fclose);
-if (the_user == ((char *) NULL))
+if (the_user == (char *) NULL)
 	file_preface = make_file_preface ();
 write_line_list (file_preface, the_stream);
 return true;
 }
 return false;
 fputs (s, rem->handle);
 return;
 }
 static void
-put_line (CONST char *string)
+put_line (const char *string)
 {
 register stream_list rem;
 for (rem = the_streams;
 rem != ((stream_list) NULL);
 rem = rem->rest_streams)
 {
-CONST char *s = string;
+const char *s = string;
 int column = 0;
 /* Divide STRING into lines.  */
 while (*s != 0)
 	{
-	  CONST char *breakpos;
+	  const char *breakpos;
 	  /* Find the last char that fits.  */
 	  for (breakpos = s; *breakpos && column < 78; ++breakpos)
 	    {
 	      if (*breakpos == '\t')
 char *mail_program_name;
 char buf[BUFLEN + 1];
 register int size;
 FILE *the_pipe;
-#if !(__STDC__ || defined(STDC_HEADERS))
-extern char *getenv ();
-#endif
 mail_program_name = getenv ("FAKEMAILER");
 if (!(mail_program_name && *mail_program_name))
 mail_program_name = (char *) MAIL_PROGRAM_NAME;
 name_length = strlen (mail_program_name);
 my_name = MY_NAME;
 the_streams = ((stream_list) NULL);
-the_date = ((char *) NULL);
+the_date = (char *) NULL;
-the_user = ((char *) NULL);
+the_user = (char *) NULL;
 the_header = read_header ();
 command_line = alloc_string ((size_t) (name_length +
 					 args_size (the_header)));
 strcpy (command_line, mail_program_name);
 parse_header (the_header, &command_line[name_length]);
 the_pipe = popen (command_line, "w");
 if (the_pipe == ((FILE *) NULL))
-fatal ("cannot open pipe to real mailer", (char *) 0);
+fatal ("cannot open pipe to real mailer", (char *) NULL);
 add_a_stream (the_pipe, pclose);
 write_header (the_header);

Mercurial > hg > xemacs-beta

comparison lib-src/fakemail.c @ 398:74fd4e045ea6 r21-2-29