xemacs-beta: src/sysdep.c comparison

comparison src/sysdep.c @ 16:0293115a14e9 r19-15b91

Import from CVS: tag r19-15b91

author	cvs
date	Mon, 13 Aug 2007 08:49:20 +0200
parents	bcdc7deadc19
children	4103f0995bd7

comparison

equal deleted inserted replaced

-:ad457d5f7d04
+:0293115a14e9
 /* ------------------------------- */
 #ifdef HAVE_TTY
 #include "console-tty.h"
 #else
-#include "syssignal.h" /* Always include before systty.h */
+#include "syssignal.h"
 #include "systty.h"
 #endif /* HAVE_TTY */
 #include "console-stream.h"
 dir = Fsymbol_value (Qdefault_directory);
 if (!STRINGP (dir))
 goto xyzzy;
 dir = expand_and_dir_to_file (Funhandled_file_name_directory (dir), Qnil);
-str = (unsigned char *) alloca (string_length (XSTRING (dir)) + 2);
+str = (unsigned char *) alloca (XSTRING_LENGTH (dir) + 2);
-len = string_length (XSTRING (dir));
+len = XSTRING_LENGTH (dir);
-memcpy (str, string_data (XSTRING (dir)), len);
+memcpy (str, XSTRING_DATA (dir), len);
 /* #### Unix specific */
 if (str[len - 1] != '/') str[len++] = '/';
 str[len] = 0;
 xyzzy:
 #endif /* HAVE_GETHOSTNAME and not VMS */
 {
 Bufbyte *p;
 Bytecount i;
-for (i = 0, p = string_data (XSTRING (Vsystem_name));
+for (i = 0, p = XSTRING_DATA (Vsystem_name);
-	 i < string_length (XSTRING (Vsystem_name));
+	 i < XSTRING_LENGTH (Vsystem_name);
 	 i++, p++)
 {
 	if (*p == ' ' || *p == '\t')
 	  *p = '-';
 }
 approach to programming and its connection to the silly
 interruptible-system-call business.  To find it, look at
 Jamie's home page (http://www.netscape.com/people/jwz). */
 #ifdef ENCAPSULATE_OPEN
 int
 sys_open (CONST char *path, int oflag, ...)
 {
 int mode;
 va_list ap;
 }
 #else
 return open (path, oflag, mode);
 #endif
 }
 #endif /* ENCAPSULATE_OPEN */
 #ifdef ENCAPSULATE_CLOSE
 int
 sys_close (int fd)
 {
 #ifdef INTERRUPTIBLE_CLOSE
 int did_retry = 0;
 return rtnval;
 #else
 return close (fd);
 #endif
 }
 #endif /* ENCAPSULATE_CLOSE */
 int
 sys_read_1 (int fildes, void *buf, unsigned int nbyte, int allow_quit)
 {
 return rtnval;
 #endif
 }
 #ifdef ENCAPSULATE_READ
 int
 sys_read (int fildes, void *buf, unsigned int 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)
 {
 return (bytes_written);
 #endif
 }
 #ifdef ENCAPSULATE_WRITE
 int
 sys_write (int fildes, CONST void *buf, unsigned int nbyte)
 {
 return sys_write_1 (fildes, buf, nbyte, 0);
 }
 #endif /* ENCAPSULATE_WRITE */
 /**************** stdio calls ****************/
 /* #### Should also encapsulate fflush().
 #### Should conceivably encapsulate getchar() etc.  What a pain! */
 #ifdef ENCAPSULATE_FOPEN
 FILE *
 sys_fopen (CONST char *path, CONST char *type)
 {
 PATHNAME_CONVERT_OUT (path);
 #ifdef INTERRUPTIBLE_OPEN
 }
 #else
 return fopen (path, type);
 #endif
 }
 #endif /* ENCAPSULATE_FOPEN */
 #ifdef ENCAPSULATE_FCLOSE
 int
 sys_fclose (FILE *stream)
 {
 #ifdef INTERRUPTIBLE_CLOSE
 int rtnval;
 return rtnval;
 #else
 return fclose (stream);
 #endif
 }
 #endif /* ENCAPSULATE_FCLOSE */
 #ifdef ENCAPSULATE_FREAD
 size_t
 sys_fread (void *ptr, size_t size, size_t nitem, FILE *stream)
 {
 #ifdef INTERRUPTIBLE_IO
 size_t rtnval;
 return (items_read);
 #else
 return fread (ptr, size, nitem, stream);
 #endif
 }
 #endif /* ENCAPSULATE_FREAD */
 #ifdef ENCAPSULATE_FWRITE
 size_t
 sys_fwrite (CONST void *ptr, size_t size, size_t nitem, FILE *stream)
 {
 #ifdef INTERRUPTIBLE_IO
 size_t rtnval;
 return vms_fwrite (ptr, size, nitem, stream);
 #else
 return fwrite (ptr, size, nitem, stream);
 #endif
 }
 #endif /* ENCAPSULATE_FWRITE */
 /********************* directory calls *******************/
 #ifdef ENCAPSULATE_CHDIR
 int
 sys_chdir (CONST char *path)
 {
 PATHNAME_CONVERT_OUT (path);
 #ifdef MSDOS
 return dos_chdir (path);
 #else
 return chdir (path);
 #endif
 }
 #endif /* ENCAPSULATE_CHDIR */
 #ifdef ENCAPSULATE_MKDIR
 int
 sys_mkdir (CONST char *path, int mode)
 {
 PATHNAME_CONVERT_OUT (path);
 return mkdir (path, mode);
 }
 #endif /* ENCAPSULATE_MKDIR */
 #ifdef ENCAPSULATE_OPENDIR
 DIR *
 sys_opendir (CONST char *filename)
 {
 DIR *rtnval;
 PATHNAME_CONVERT_OUT (filename);
 while (!(rtnval = opendir (filename))
 	 && (errno == EINTR))
 ;
 return rtnval;
 }
 #endif /* ENCAPSULATE_OPENDIR */
 #ifdef ENCAPSULATE_READDIR
 DIRENTRY *
 sys_readdir (DIR *dirp)
 {
 DIRENTRY *rtnval;
 while (!(errno = 0, rtnval = readdir (dirp))
 	 && (errno == EINTR))
 ;
 return rtnval;
 }
 #endif /* ENCAPSULATE_READDIR */
 #ifdef ENCAPSULATE_CLOSEDIR
 int
 sys_closedir (DIR *dirp)
 {
 int rtnval;
 while ((rtnval = closedir (dirp)) == -1
 	 && (errno == EINTR))
 ;
 return rtnval;
 }
 #endif /* ENCAPSULATE_CLOSEDIR */
 #ifdef ENCAPSULATE_RMDIR
 int
 sys_rmdir (CONST char *path)
 {
 PATHNAME_CONVERT_OUT (path);
 return rmdir (path);
 }
 #endif /* ENCAPSULATE_RMDIR */
 /***************** file-information calls ******************/
 #ifdef ENCAPSULATE_ACCESS
 int
 sys_access (CONST char *path, int mode)
 {
 PATHNAME_CONVERT_OUT (path);
 #ifdef VMS
 return vms_access (path, mode);
 #else
 return access (path, mode);
 #endif
 }
 #endif /* ENCAPSULATE_ACCESS */
 #ifdef HAVE_EACCESS
 #ifdef ENCAPSULATE_EACCESS
 int
 sys_eaccess (CONST char *path, int mode)
 {
 PATHNAME_CONVERT_OUT (path);
 return eaccess (path, mode);
 }
 #endif /* ENCAPSULATE_EACCESS */
 #endif /* HAVE_EACCESS */
 #ifdef ENCAPSULATE_LSTAT
 int
 sys_lstat (CONST char *path, struct stat *buf)
 {
 PATHNAME_CONVERT_OUT (path);
 return lstat (path, buf);
 }
 #endif /* ENCAPSULATE_LSTAT */
 #ifdef ENCAPSULATE_READLINK
 int
 sys_readlink (CONST char *path, char *buf, int bufsiz)
 {
 PATHNAME_CONVERT_OUT (path);
 /* #### currently we don't do conversions on the incoming data */
 return readlink (path, buf, bufsiz);
 }
 #endif /* ENCAPSULATE_READLINK */
 #ifdef ENCAPSULATE_STAT
 int
 sys_stat (CONST char *path, struct stat *buf)
 {
 PATHNAME_CONVERT_OUT (path);
 return stat (path, buf);
 }
 #endif /* ENCAPSULATE_STAT */
 /****************** file-manipulation calls *****************/
 #ifdef ENCAPSULATE_CHMOD
 int
 sys_chmod (CONST char *path, int mode)
 {
 PATHNAME_CONVERT_OUT (path);
 return chmod (path, mode);
 }
 #endif /* ENCAPSULATE_CHMOD */
 #ifdef ENCAPSULATE_CREAT
 int
 sys_creat (CONST char *path, int mode)
 {
 PATHNAME_CONVERT_OUT (path);
 return creat (path, mode);
 }
 #endif /* ENCAPSULATE_CREAT */
 #ifdef ENCAPSULATE_LINK
 int
 sys_link (CONST char *existing, CONST char *new)
 {
 PATHNAME_CONVERT_OUT (existing);
 PATHNAME_CONVERT_OUT (new);
 return link (existing, new);
 }
 #endif /* ENCAPSULATE_LINK */
 #ifdef ENCAPSULATE_RENAME
 int
 sys_rename (CONST char *old, CONST char *new)
 {
 PATHNAME_CONVERT_OUT (old);
 PATHNAME_CONVERT_OUT (new);
 return rename (old, new);
 }
 #endif /* ENCAPSULATE_RENAME */
 #ifdef ENCAPSULATE_SYMLINK
 int
 sys_symlink (CONST char *name1, CONST char *name2)
 {
 PATHNAME_CONVERT_OUT (name1);
 PATHNAME_CONVERT_OUT (name2);
 return symlink (name1, name2);
 }
 #endif /* ENCAPSULATE_SYMLINK */
 #ifdef ENCAPSULATE_UNLINK
 int
 sys_unlink (CONST char *path)
 {
 PATHNAME_CONVERT_OUT (path);
 return unlink (path);
 }
 #endif /* ENCAPSULATE_UNLINK */
+#ifdef ENCAPSULATE_EXECVP
+int
+sys_execvp (CONST char *path, char * CONST argv[])
+{
+int i;
+PATHNAME_CONVERT_OUT (path);
+for (i = 0; argv[i]; i++)
+PATHNAME_CONVERT_OUT (argv[i]);
+return execvp (path, argv);
+}
+#endif /* ENCAPSULATE_EXECVP */
 /************************************************************************/
 /*                  Emulations of missing system calls                  */
 /************************************************************************/
 /***** (these are primarily required for USG, it seems) *****/
 /*
-*	Warning, this function may not duplicate 4.2 action properly
+*	Warning, this function may not duplicate BSD 4.2 action properly
 *	under error conditions.
 */
 #ifndef HAVE_GETWD
 char *
 getwd (char *pathname)
 {
 char *npath, *spath;
 #if !__STDC__ && !defined(STDC_HEADERS)
 npath++;
 strcpy (pathname, npath);
 xfree (spath);                  /* getcwd uses malloc */
 return pathname;
 }
 #endif /* HAVE_GETWD */
 /*
 *	Emulate rename using unlink/link.  Note that this is
 *	only partially correct.  Also, doesn't enforce restriction
 *	that files be of same type (regular->regular, dir->dir, etc).
 */
 #ifndef HAVE_RENAME
 int
 rename (CONST char *from, CONST char *to)
 {
 if (access (from, 0) == 0)
 {
 	if (unlink (from) == 0)
 	  return (0);
 }
 return (-1);
 }
+#endif /* HAVE_RENAME */
-#endif
 #ifdef HPUX
 #ifndef HAVE_PERROR
 /* HPUX curses library references perror, but as far as we know

Mercurial > hg > xemacs-beta

comparison src/sysdep.c @ 16:0293115a14e9 r19-15b91