xemacs-beta: src/sysdep.c comparison

comparison src/sysdep.c @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34

author	cvs
date	Mon, 13 Aug 2007 10:28:48 +0200
parents	727739f917cb
children	ca9a9ec9c1c1

comparison

equal deleted inserted replaced

-:c7b7086b0a39
+:c5d627a313b1
 #endif /* WINDOWSNT */
 #include "lisp.h"
 #include <stddef.h>
+#include <stdlib.h>
 /* ------------------------------- */
 /*          basic includes         */
 /* ------------------------------- */
 DEVICE_TTY_DATA (d)->ospeed = sg.sg_ospeed;
 #endif
 }
 DEVICE_BAUD_RATE (d) =
-(DEVICE_TTY_DATA (d)->ospeed < sizeof baud_convert / sizeof baud_convert[0]
+(DEVICE_TTY_DATA (d)->ospeed < countof (baud_convert)
 ? baud_convert[DEVICE_TTY_DATA (d)->ospeed]
 : 9600);
 if (DEVICE_BAUD_RATE (d) == 0)
 DEVICE_BAUD_RATE (d) = 1200;
 *	at the normal shared text boundry and the startofdata variable
 *	will be patched by unexec to the correct value.
 *
 */
+#ifdef ORDINARY_LINK
+extern char **environ;
+#endif
 void *
 start_of_data (void)
 {
 #ifdef DATA_START
 return ((char *) DATA_START);
 * This is a hack.  Since we're not linking crt0.c or pre_crt0.c,
 * data_start isn't defined.  We take the address of environ, which
 * is known to live at or near the start of the system crt0.c, and
 * we don't sweat the handful of bytes that might lose.
 */
-extern char **environ;
 #ifdef HEAP_IN_DATA
 extern char* static_heap_base;
 if (!initialized)
 return static_heap_base;
 #endif
 libraries on some machines and make the dumped emacs core dump. */
 #  ifndef CANNOT_DUMP
 if (initialized)
 #  endif /* not CANNOT_DUMP */
 {
-struct hostent *hp;
+struct hostent *hp = NULL;
 int count;
 #  ifdef TRY_AGAIN
 for (count = 0; count < 10; count++)
 	{
 	  h_errno = 0;
 /************************************************************************/
 /*                    Encapsulations of system calls                    */
 /************************************************************************/
 #define PATHNAME_CONVERT_OUT(path) \
-GET_C_CHARPTR_EXT_FILENAME_DATA_ALLOCA (path, path)
+GET_C_CHARPTR_EXT_FILENAME_DATA_ALLOCA ((CONST Bufbyte *) path, path)
 /***** MSDOS versions are in msdos.c *****/
 /***************** low-level calls ****************/
 /* Must copy PATH, because it might be the data of a Lisp_String,
 which could be relocated by GC when checking for QUIT.  */
 memcpy (nonreloc, path, len + 1);
-/* The same as PATHNAME_CONVERT_OUT in sysdep.c.  */
+PATHNAME_CONVERT_OUT (nonreloc);
-GET_C_CHARPTR_EXT_FILENAME_DATA_ALLOCA (nonreloc, nonreloc);
 for (;;)
 {
 int rtnval = open (nonreloc, oflag, mode);
 if (!(rtnval == -1 && errno == EINTR))
 #endif
 }
 #endif /* ENCAPSULATE_CLOSE */
 int
-sys_read_1 (int fildes, void *buf, unsigned int nbyte, int allow_quit)
+sys_read_1 (int fildes, void *buf, size_t nbyte, int allow_quit)
 {
 int rtnval;
 /* No harm in looping regardless of the INTERRUPTIBLE_IO setting. */
 while ((rtnval = read (fildes, buf, nbyte)) == -1
 return rtnval;
 }
 #ifdef ENCAPSULATE_READ
 int
-sys_read (int fildes, void *buf, unsigned int nbyte)
+sys_read (int fildes, void *buf, size_t nbyte)
 {
 return sys_read_1 (fildes, buf, nbyte, 0);
 }
 #endif /* ENCAPSULATE_READ */
 int
-sys_write_1 (int fildes, CONST void *buf, unsigned int nbyte, int allow_quit)
+sys_write_1 (int fildes, CONST void *buf, size_t nbyte, int allow_quit)
 {
 int rtnval;
 int bytes_written = 0;
 CONST char *b = (CONST char *) buf;
 return (bytes_written);
 }
 #ifdef ENCAPSULATE_WRITE
 int
-sys_write (int fildes, CONST void *buf, unsigned int nbyte)
+sys_write (int fildes, CONST void *buf, size_t nbyte)
 {
 return sys_write_1 (fildes, buf, nbyte, 0);
 }
 #endif /* ENCAPSULATE_WRITE */
 #endif /* ENCAPSULATE_CHDIR */
 #ifdef ENCAPSULATE_MKDIR
 int
-sys_mkdir (CONST char *path, int mode)
+sys_mkdir (CONST char *path, mode_t mode)
 {
 PATHNAME_CONVERT_OUT (path);
 return mkdir (path, mode);
 }
 #endif /* ENCAPSULATE_MKDIR */
 #endif /* ENCAPSULATE_LSTAT */
 #ifdef ENCAPSULATE_READLINK
 int
-sys_readlink (CONST char *path, char *buf, int bufsiz)
+sys_readlink (CONST char *path, char *buf, size_t bufsiz)
 {
 PATHNAME_CONVERT_OUT (path);
 /* #### currently we don't do conversions on the incoming data */
 return readlink (path, buf, bufsiz);
 }
 /****************** file-manipulation calls *****************/
 #ifdef ENCAPSULATE_CHMOD
 int
-sys_chmod (CONST char *path, int mode)
+sys_chmod (CONST char *path, mode_t mode)
 {
 PATHNAME_CONVERT_OUT (path);
 return chmod (path, mode);
 }
 #endif /* ENCAPSULATE_CHMOD */
 #ifdef ENCAPSULATE_CREAT
 int
-sys_creat (CONST char *path, int mode)
+sys_creat (CONST char *path, mode_t mode)
 {
 PATHNAME_CONVERT_OUT (path);
 return creat (path, mode);
 }
 #endif /* ENCAPSULATE_CREAT */
 #ifdef ENCAPSULATE_EXECVP
 int
 sys_execvp (CONST char *path, char * CONST * argv)
 {
 int i, argc;
-CONST char ** new_argv;
+char ** new_argv;
 PATHNAME_CONVERT_OUT (path);
 for (argc = 0; argv[argc]; argc++)
 ;
-new_argv = alloca_array (CONST char *, argc + 1);
+new_argv = alloca_array (char *, argc + 1);
 for (i = 0; i < argc; i++)
-GET_C_CHARPTR_EXT_FILENAME_DATA_ALLOCA (argv[i], new_argv[i]);
+{
+new_argv[i] = argv[i];
+PATHNAME_CONVERT_OUT (new_argv[i]);
+}
 new_argv[argc] = NULL;
-return execvp (path, (char **) new_argv);
+return execvp (path, new_argv);
 }
 #endif /* ENCAPSULATE_EXECVP */
 /************************************************************************/
 #endif /* need at least 4 */
 #endif /* need at least 3 */
 #endif /* need at least 2 */
 return val & ((1L << VALBITS) - 1);
 }
-#ifdef WRONG_NAME_INSQUE
-void
-insque (caddr_t q, caddr_t p)
-{
-_insque (q,p);
-}
-#endif
 /************************************************************************/
 /*               Strings corresponding to defined signals               */
 /************************************************************************/

Mercurial > hg > xemacs-beta

comparison src/sysdep.c @ 272:c5d627a313b1 r21-0b34