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

comparison lib-src/ellcc.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	aabb7f5b1c81
children	de805c49cfc1

comparison

equal deleted inserted replaced

-:f4aeb21a5bad
+:74fd4e045ea6
 Please mail bugs and suggestions to the XEmacs maintainer.
 */
 /*
 Here's the scoop. We would really like this to be a shell script, but
-the various Windows platforms dont have reliable scripting that suits
+the various Windows platforms don't have reliable scripting that suits
-our needs. We dont want to reply on perl or some other such language
+our needs. We don't want to rely on perl or some other such language
 so we have to roll our own executable to act as a front-end for the
 compiler.
 This program is used to invoke the compiler, the linker and to generate
 the module specific documentation and initialization code.  We assume we
 -o $@ $(SRCS)
 See the samples for more details.
 */
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef MSDOS
-# include <fcntl.h>
-# include <sys/param.h>
-# include <io.h>
-# ifndef HAVE_CONFIG_H
-#   define DOS_NT
-#   include <sys/config.h>
-# endif
-#endif /* MSDOS */
-#ifdef WINDOWSNT
-# include <stdlib.h>
-# include <fcntl.h>
-# include <string.h>
-# include <io.h>
-# define MAXPATHLEN _MAX_PATH
-# ifdef HAVE_CONFIG_H
-#   undef HAVE_NTGUI
-# else
-#   define DOS_NT
-#   define HAVE_GETCWD
-# endif /* not HAVE_CONFIG_H */
-#endif /* WINDOWSNT */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-/* On some systems, Emacs defines static as nothing for the sake
-of unexec.  We don't want that here since we don't use unexec. */
-# undef static
-#endif /* HAVE_CONFIG_H */
-#if !defined (WINDOWSNT) && defined (STDC_HEADERS)
-#include <stdlib.h>
 #include <string.h>
-#endif
+#include <ctype.h>
+#include <errno.h>
+#include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
-#else
-# ifdef HAVE_GETCWD
-extern char *getcwd ();
-# endif
 #endif /* HAVE_UNISTD_H */
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
 #define EMODULES_GATHER_VERSION
-#include "emodules.h"
-#include "ellcc.h"
+#include <emodules.h>
+#include <ellcc.h> /* Generated files must be included using <...> */
-#if !defined (S_ISREG) && defined (S_IFREG)
-# define S_ISREG(m)	(((m) & S_IFMT) == S_IFREG)
-#endif
-/* Exit codes for success and failure.  */
-#ifdef VMS
-# define	GOOD	1
-# define	BAD	0
-#else
-# define	GOOD	0
-# define	BAD	1
-#endif
 #define DEBUG
 #ifndef HAVE_SHLIB
 int
-main()
+main (int argc, char *argv[])
 {
 fprintf (stderr, "Dynamic modules not supported on this platform\n");
-return (BAD);
+return EXIT_FAILURE;
 }
 #else
 /*
 * Try to figure out the commands we need to use to create shared objects,
 						   (op), (n) * sizeof (Type)))
 #else
 # define xnew(n,Type)	  ((Type *) xmalloc ((n) * sizeof (Type)))
 # define xrnew(op,n,Type) ((Type *) xrealloc ((op), (n) * sizeof (Type)))
 #endif
-long *xmalloc (), *xrealloc ();
+static void *xmalloc (size_t);
-void fatal (), pfatal ();
+static void fatal (char *, char *);
-char *ellcc_strchr (), *ellcc_strrchr ();
+static void add_to_argv (const char *);
-void add_to_argv ();
+static void do_compile_mode (void);
-void do_compile_mode(), do_link_mode(), do_init_mode();
+static void do_link_mode (void);
+static void do_init_mode (void);
 #define SSTR(S) ((S)?(S):"")
 #define ELLCC_COMPILE_MODE      0
 #define ELLCC_LINK_MODE         1
 STR = getenv(EVAR); \
 if ((STR) == (char *)0) \
 STR = DFLT
 int
-main (argc, argv)
+main (int argc, char *argv[])
-int argc;
-char *argv[];
 {
 char *tmp;
 int i, done_mode = 0;
 prog_argc = argc;
 prog_argv = argv;
 #if defined(MSDOS) || defined(WINDOWSNT)
-tmp = ellcc_strrchr (argv[0], '\\');
+tmp = strrchr (argv[0], '\\');
 if (tmp != (char *)0)
 tmp++;
 #elif !defined (VMS)
-tmp = ellcc_strrchr (argv[0], '/');
+tmp = strrchr (argv[0], '/');
 if (tmp != (char *)0)
 tmp++;
 #else
 tmp = argv[0];
 #endif
 if (strncmp (argv[i], "--mode=", 7) == 0)
 {
 char *modeopt = argv[i] + 7;
 if (done_mode && strcmp (modeopt, "verbose"))
-fatal ("more than one mode specified");
+fatal ("more than one mode specified", (char *) 0);
 if (strcmp (modeopt, "link") == 0)
 {
 done_mode++;
 ellcc_mode = ELLCC_LINK_MODE;
 }
 else if (strcmp (argv[i], "--mod-config") == 0)
 {
 printf ("%s\n", ELLCC_CONFIG);
 return 0;
 }
-else if (strncmp (argv[i], "--mod-name=", 10) == 0)
+else if (strncmp (argv[i], "--mod-name=", 11) == 0)
 mod_name = argv[i] + 11;
-else if (strncmp (argv[i], "--mod-title=", 11) == 0)
+else if (strncmp (argv[i], "--mod-title=", 12) == 0)
 mod_title = argv[i] + 12;
-else if (strncmp (argv[i], "--mod-version=", 13) == 0)
+else if (strncmp (argv[i], "--mod-version=", 14) == 0)
 mod_version = argv[i] + 14;
-else if (strncmp (argv[i], "--mod-output=", 12) == 0)
+else if (strncmp (argv[i], "--mod-output=", 13) == 0)
 mod_output = argv[i] + 13;
 else
 {
 exec_args[exec_argc] = i;
 exec_argc++;
 printf ("\n");
 }
 #endif
 if (exec_argc < 2)
-fatal ("too few arguments");
+fatal ("too few arguments", (char *) 0);
 /*
 * Get the over-rides from the environment
 */
 OVERENV(ellcc, "ELLCC", ELLCC_CC);
 printf ("%s exited with status %d\n", exec_argv[0], i);
 return i;
 }
 /* Like malloc but get fatal error if memory is exhausted.  */
-long *
+static void *
-xmalloc (size)
+xmalloc (size_t size)
-unsigned int size;
+{
-{
+void *result = malloc (size);
-long *result = (long *) malloc (size);
 if (result == NULL)
-fatal ("virtual memory exhausted", (char *)NULL);
+fatal ("virtual memory exhausted", (char *)0);
 return result;
 }
-long *
-xrealloc (ptr, size)
-char *ptr;
-unsigned int size;
-{
-long *result =  (long *) realloc (ptr, size);
-if (result == NULL)
-fatal ("virtual memory exhausted", (char *)NULL);
-return result;
-}
 /* Print error message and exit.  */
-void
+static void
-fatal (s1, s2)
+fatal (char *s1, char *s2)
-char *s1, *s2;
 {
 fprintf (stderr, "%s: ", progname);
 fprintf (stderr, s1, s2);
 fprintf (stderr, "\n");
-exit (BAD);
+exit (EXIT_FAILURE);
-}
-void
-pfatal (s1)
-char *s1;
-{
-perror (s1);
-exit (BAD);
-}
-/*
-* Return the ptr in sp at which the character c last
-* appears; NULL if not found
-*
-* Identical to System V strrchr, included for portability.
-*/
-char *
-ellcc_strrchr (sp, c)
-register char *sp, c;
-{
-register char *r;
-r = NULL;
-do
-{
-if (*sp == c)
-	r = sp;
-} while (*sp++);
-return r;
-}
-/*
-* Return the ptr in sp at which the character c first
-* appears; NULL if not found
-*
-* Identical to System V strchr, included for portability.
-*/
-char *
-ellcc_strchr (sp, c)
-register char *sp, c;
-{
-do
-{
-if (*sp == c)
-	return sp;
-} while (*sp++);
-return NULL;
 }
 /*
 * Add a string to the argument vector list that will be passed on down
 * to the compiler or linker. We need to split individual words into
 * arguments, taking quoting into account. This can get ugly.
 */
-void
+static void
-add_to_argv (str)
+add_to_argv (const char *str)
-CONST char *str;
 {
 int sm = 0;
-CONST char *s = (CONST char *)0;
+const char *s = (const char *)0;
-if ((str == (CONST char *)0) || (str[0] == '\0'))
+if ((str == (const char *)0) || (str[0] == '\0'))
 return;
 while (*str)
 {
 switch (sm)
 {
 case 0: /* Start of case - string leading whitespace */
-if (isspace (*str))
+if (isspace ((unsigned char) *str))
 str++;
 else
 {
 sm = 1; /* Change state to non-whitespace */
 s = str; /* Mark the start of THIS argument */
 }
 break;
 case 1: /* Non-whitespace character. Mark the start */
-if (isspace (*str))
+if (isspace ((unsigned char) *str))
 {
 /* Reached the end of the argument. Add it. */
 int l = str-s;
 exec_argv[real_argc] = xnew (l+2, char);
 strncpy (exec_argv[real_argc], s, l);
 exec_argv[real_argc][l] = '\0';
 real_argc++;
 sm = 0; /* Back to start state */
-s = (CONST char *)0;
+s = (const char *)0;
 break;
 }
 else if (*str == '\\')
 {
 sm = 2; /* Escaped character */
 str++;
 break;
 }
 }
-if (s != (CONST char *)0)
+if (s != (const char *)0)
 {
 int l = str-s;
 exec_argv[real_argc] = xnew (l+2, char);
 strncpy (exec_argv[real_argc], s, l);
 exec_argv[real_argc][l] = '\0';
 real_argc++;
-s = (CONST char *)0;
+s = (const char *)0;
 }
 }
 /*
 * For compile mode, things are pretty straight forward. All we need to do
 * is build up the argument vector and exec() it. We must just make sure
 * that we get all of the required arguments in place.
 */
-void
+static void
-do_compile_mode()
+do_compile_mode (void)
 {
 int i;
 char ts[4096]; /* Plenty big enough */
 add_to_argv (ellcc);
 * insert the linker commands first, replace any occurrence of ELLSONAME
 * with the desired output file name, insert the output arguments, then
 * all of the provided arguments, then the final post arguments. Once
 * all of this has been done, the argument vector is ready to run.
 */
-void
+static void
-do_link_mode()
+do_link_mode (void)
 {
 int i,x;
 char *t, ts[4096]; /* Plenty big enough */
 add_to_argv (ellld);
 * passed on the command line are the names of source files which the
 * make-doc program will be processing. We prepare the output file with
 * the header information first, as make-doc will append to the file by
 * special dispensation.
 */
-void
+static void
-do_init_mode()
+do_init_mode (void)
 {
 int i;
 char ts[4096]; /* Plenty big enough */
 char *mdocprog;
 FILE *mout = fopen (mod_output, "w");

Mercurial > hg > xemacs-beta

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