HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix previous conflict.
[bpt/emacs.git]
/
lib-src
/
fakemail.c
diff --git
a/lib-src/fakemail.c
b/lib-src/fakemail.c
index
993f90f
..
f4d978b
100644
(file)
--- a/
lib-src/fakemail.c
+++ b/
lib-src/fakemail.c
@@
-1,13
+1,16
@@
/* sendmail-like interface to /bin/mail for system V,
Copyright (C) 1985, 1994, 1999, 2001, 2002, 2003, 2004,
/* sendmail-like interface to /bin/mail for system V,
Copyright (C) 1985, 1994, 1999, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+Author: Bill Rozas <jinx@martigny.ai.mit.edu>
+(according to ack.texi)
This file is part of GNU Emacs.
This file is part of GNU Emacs.
-GNU Emacs is free software
;
you can redistribute it and/or modify
+GNU Emacs is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
-the Free Software Foundation
; either version 3, or (at your option)
-any later version.
+the Free Software Foundation
, either version 3 of the License, or
+
(at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,9
+18,8
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
+
#define _XOPEN_SOURCE 500 /* for cuserid */
#define _XOPEN_SOURCE 500 /* for cuserid */
@@
-25,7
+27,7
@@
Boston, MA 02110-1301, USA. */
#include <config.h>
#endif
#include <config.h>
#endif
-#if defined (BSD_SYSTEM) && !defined (
BSD4_1) && !defined (
USE_FAKEMAIL)
+#if defined (BSD_SYSTEM) && !defined (USE_FAKEMAIL)
/* This program isnot used in BSD, so just avoid loader complaints. */
int
main ()
/* This program isnot used in BSD, so just avoid loader complaints. */
int
main ()
@@
-98,7
+100,7
@@
typedef struct header_record *header;
struct stream_record
{
FILE *handle;
struct stream_record
{
FILE *handle;
- int (*action)();
+ int (*action)(
FILE *
);
struct stream_record *rest_streams;
};
typedef struct stream_record *stream_list;
struct stream_record *rest_streams;
};
typedef struct stream_record *stream_list;
@@
-145,8
+147,8
@@
static line_list file_preface;
static stream_list the_streams;
static boolean no_problems = true;
static stream_list the_streams;
static boolean no_problems = true;
-extern FILE *popen ();
-extern int fclose (
), pclose (
);
+extern FILE *popen (
const char *, const char *
);
+extern int fclose (
FILE *), pclose (FILE *
);
#ifdef CURRENT_USER
extern struct passwd *getpwuid ();
#ifdef CURRENT_USER
extern struct passwd *getpwuid ();
@@
-162,8
+164,7
@@
static struct passwd *my_entry;
/* Print error message. `s1' is printf control string, `s2' is arg for it. */
static void
/* Print error message. `s1' is printf control string, `s2' is arg for it. */
static void
-error (s1, s2)
- char *s1, *s2;
+error (char *s1, char *s2)
{
printf ("%s: ", my_name);
printf (s1, s2);
{
printf ("%s: ", my_name);
printf (s1, s2);
@@
-174,8
+175,7
@@
error (s1, s2)
/* Print error message and exit. */
static void
/* Print error message and exit. */
static void
-fatal (s1)
- char *s1;
+fatal (char *s1)
{
error ("%s", s1);
exit (EXIT_FAILURE);
{
error ("%s", s1);
exit (EXIT_FAILURE);
@@
-184,8
+184,7
@@
fatal (s1)
/* Like malloc but get fatal error if memory is exhausted. */
static long *
/* Like malloc but get fatal error if memory is exhausted. */
static long *
-xmalloc (size)
- int size;
+xmalloc (int size)
{
long *result = (long *) malloc (((unsigned) size));
if (result == ((long *) NULL))
{
long *result = (long *) malloc (((unsigned) size));
if (result == ((long *) NULL))
@@
-194,9
+193,7
@@
xmalloc (size)
}
static long *
}
static long *
-xrealloc (ptr, size)
- long *ptr;
- int size;
+xrealloc (long int *ptr, int size)
{
long *result = (long *) realloc (ptr, ((unsigned) size));
if (result == ((long *) NULL))
{
long *result = (long *) realloc (ptr, ((unsigned) size));
if (result == ((long *) NULL))
@@
-207,8
+204,7
@@
xrealloc (ptr, size)
/* Initialize a linebuffer for use */
void
/* Initialize a linebuffer for use */
void
-init_linebuffer (linebuffer)
- struct linebuffer *linebuffer;
+init_linebuffer (struct linebuffer *linebuffer)
{
linebuffer->size = INITIAL_LINE_SIZE;
linebuffer->buffer = ((char *) xmalloc (INITIAL_LINE_SIZE));
{
linebuffer->size = INITIAL_LINE_SIZE;
linebuffer->buffer = ((char *) xmalloc (INITIAL_LINE_SIZE));
@@
-218,9
+214,7
@@
init_linebuffer (linebuffer)
Return the length of the line. */
long
Return the length of the line. */
long
-readline (linebuffer, stream)
- struct linebuffer *linebuffer;
- FILE *stream;
+readline (struct linebuffer *linebuffer, FILE *stream)
{
char *buffer = linebuffer->buffer;
char *p = linebuffer->buffer;
{
char *buffer = linebuffer->buffer;
char *p = linebuffer->buffer;
@@
-255,9
+249,7
@@
readline (linebuffer, stream)
If there is no keyword, return NULL and don't alter *REST. */
char *
If there is no keyword, return NULL and don't alter *REST. */
char *
-get_keyword (field, rest)
- register char *field;
- char **rest;
+get_keyword (register char *field, char **rest)
{
static char keyword[KEYWORD_SIZE];
register char *ptr;
{
static char keyword[KEYWORD_SIZE];
register char *ptr;
@@
-282,8
+274,7
@@
get_keyword (field, rest)
/* Nonzero if the string FIELD starts with a colon-terminated keyword. */
boolean
/* Nonzero if the string FIELD starts with a colon-terminated keyword. */
boolean
-has_keyword (field)
- char *field;
+has_keyword (char *field)
{
char *ignored;
return (get_keyword (field, &ignored) != ((char *) NULL));
{
char *ignored;
return (get_keyword (field, &ignored) != ((char *) NULL));
@@
-300,9
+291,7
@@
has_keyword (field)
the caller has to make it big enough. */
char *
the caller has to make it big enough. */
char *
-add_field (the_list, field, where)
- line_list the_list;
- register char *field, *where;
+add_field (line_list the_list, register char *field, register char *where)
{
register char c;
while (true)
{
register char c;
while (true)
@@
-358,7
+347,7
@@
add_field (the_list, field, where)
}
\f
line_list
}
\f
line_list
-make_file_preface ()
+make_file_preface (
void
)
{
char *the_string, *temp;
long idiotic_interface;
{
char *the_string, *temp;
long idiotic_interface;
@@
-402,9
+391,7
@@
make_file_preface ()
}
void
}
void
-write_line_list (the_list, the_stream)
- register line_list the_list;
- FILE *the_stream;
+write_line_list (register line_list the_list, FILE *the_stream)
{
for ( ;
the_list != ((line_list) NULL) ;
{
for ( ;
the_list != ((line_list) NULL) ;
@@
-417,7
+404,7
@@
write_line_list (the_list, the_stream)
}
\f
int
}
\f
int
-close_the_streams ()
+close_the_streams (
void
)
{
register stream_list rem;
for (rem = the_streams;
{
register stream_list rem;
for (rem = the_streams;
@@
-430,9
+417,7
@@
close_the_streams ()
}
void
}
void
-add_a_stream (the_stream, closing_action)
- FILE *the_stream;
- int (*closing_action)();
+add_a_stream (FILE *the_stream, int (*closing_action) (FILE *))
{
stream_list old = the_streams;
the_streams = new_stream ();
{
stream_list old = the_streams;
the_streams = new_stream ();
@@
-443,8
+428,7
@@
add_a_stream (the_stream, closing_action)
}
int
}
int
-my_fclose (the_file)
- FILE *the_file;
+my_fclose (FILE *the_file)
{
putc ('\n', the_file);
fflush (the_file);
{
putc ('\n', the_file);
fflush (the_file);
@@
-452,8
+436,7
@@
my_fclose (the_file)
}
boolean
}
boolean
-open_a_file (name)
- char *name;
+open_a_file (char *name)
{
FILE *the_stream = fopen (name, "a");
if (the_stream != ((FILE *) NULL))
{
FILE *the_stream = fopen (name, "a");
if (the_stream != ((FILE *) NULL))
@@
-468,8
+451,7
@@
open_a_file (name)
}
void
}
void
-put_string (s)
- char *s;
+put_string (char *s)
{
register stream_list rem;
for (rem = the_streams;
{
register stream_list rem;
for (rem = the_streams;
@@
-480,8
+462,7
@@
put_string (s)
}
void
}
void
-put_line (string)
- char *string;
+put_line (char *string)
{
register stream_list rem;
for (rem = the_streams;
{
register stream_list rem;
for (rem = the_streams;
@@
-541,9
+522,7
@@
put_line (string)
Call open_a_file for each file. */
void
Call open_a_file for each file. */
void
-setup_files (the_list, field)
- register line_list the_list;
- register char *field;
+setup_files (register line_list the_list, register char *field)
{
register char *start;
register char c;
{
register char *start;
register char c;
@@
-579,8
+558,7
@@
setup_files (the_list, field)
The result says how big to make the buffer to pass to parse_header. */
int
The result says how big to make the buffer to pass to parse_header. */
int
-args_size (the_header)
- header the_header;
+args_size (header the_header)
{
register header old = the_header;
register line_list rem;
{
register header old = the_header;
register line_list rem;
@@
-611,9
+589,7
@@
args_size (the_header)
Also, if the header has any FCC fields, call setup_files for each one. */
void
Also, if the header has any FCC fields, call setup_files for each one. */
void
-parse_header (the_header, where)
- header the_header;
- register char *where;
+parse_header (header the_header, register char *where)
{
register header old = the_header;
do
{
register header old = the_header;
do
@@
-645,7
+621,7
@@
parse_header (the_header, where)
Continuation lines are grouped in the headers they continue. */
header
Continuation lines are grouped in the headers they continue. */
header
-read_header ()
+read_header (
void
)
{
register header the_header = ((header) NULL);
register line_list *next_line = ((line_list *) NULL);
{
register header the_header = ((header) NULL);
register line_list *next_line = ((line_list *) NULL);
@@
-699,8
+675,7
@@
read_header ()
}
\f
void
}
\f
void
-write_header (the_header)
- header the_header;
+write_header (header the_header)
{
register header old = the_header;
do
{
register header old = the_header;
do
@@
-717,9
+692,7
@@
write_header (the_header)
}
\f
int
}
\f
int
-main (argc, argv)
- int argc;
- char **argv;
+main (int argc, char **argv)
{
char *command_line;
header the_header;
{
char *command_line;
header the_header;
@@
-729,7
+702,7
@@
main (argc, argv)
register int size;
FILE *the_pipe;
register int size;
FILE *the_pipe;
- extern char *getenv ();
+ extern char *getenv (
const char *
);
mail_program_name = getenv ("FAKEMAILER");
if (!(mail_program_name && *mail_program_name))
mail_program_name = getenv ("FAKEMAILER");
if (!(mail_program_name && *mail_program_name))