projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(enum lrecord_type): Add `lrecord_type_uint16_byte_table' and
[chise/xemacs-chise.git-]
/
src
/
callproc.c
diff --git
a/src/callproc.c
b/src/callproc.c
index
54ec8d0
..
1ce04b0
100644
(file)
--- a/
src/callproc.c
+++ b/
src/callproc.c
@@
-67,7
+67,7
@@
Lisp_Object Vprocess_environment;
volatile int synch_process_alive;
/* Nonzero => this is a string explaining death of synchronous subprocess. */
volatile int synch_process_alive;
/* Nonzero => this is a string explaining death of synchronous subprocess. */
-CONST char *synch_process_death;
+const char *synch_process_death;
/* If synch_process_death is zero,
this is exit code of synchronous subprocess. */
/* If synch_process_death is zero,
this is exit code of synchronous subprocess. */
@@
-152,7
+152,7
@@
report_fork_error (char *string, Lisp_Object data)
}
#endif /* unused */
}
#endif /* unused */
-DEFUN ("call-process-internal", Fcall_process_internal, 1, MANY, 0, /*
+DEFUN ("old-call-process-internal", Fold_call_process_internal, 1, MANY, 0, /*
Call PROGRAM synchronously in separate process, with coding-system specified.
Arguments are
(PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS).
Call PROGRAM synchronously in separate process, with coding-system specified.
Arguments are
(PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS).
@@
-188,7
+188,7
@@
If you quit, the process is killed with SIGINT, or SIGKILL if you
char *bufptr = buf;
int bufsize = 16384;
int speccount = specpdl_depth ();
char *bufptr = buf;
int bufsize = 16384;
int speccount = specpdl_depth ();
- struct gcpro gcpro1, gcpro2;
+ struct gcpro gcpro1, gcpro2, gcpro3;
char **new_argv = alloca_array (char *, max (2, nargs - 2));
/* File to use for stderr in the child.
char **new_argv = alloca_array (char *, max (2, nargs - 2));
/* File to use for stderr in the child.
@@
-235,7
+235,7
@@
If you quit, the process is killed with SIGINT, or SIGKILL if you
NUNGCPRO;
}
NUNGCPRO;
}
- GCPRO1 (current_dir);
+ GCPRO2 (current_dir, path);
if (nargs >= 2 && ! NILP (args[1]))
{
if (nargs >= 2 && ! NILP (args[1]))
{
@@
-250,7
+250,7
@@
If you quit, the process is killed with SIGINT, or SIGKILL if you
UNGCPRO;
UNGCPRO;
- GCPRO2 (infile, current_dir); /* Fexpand_file_name might trash it */
+ GCPRO3 (infile, current_dir, path); /* Fexpand_file_name might trash it */
if (nargs >= 3)
{
if (nargs >= 3)
{
@@
-348,7
+348,7
@@
If you quit, the process is killed with SIGINT, or SIGKILL if you
fd_error = open (NULL_DEVICE, O_WRONLY | OPEN_BINARY);
else if (STRINGP (error_file))
{
fd_error = open (NULL_DEVICE, O_WRONLY | OPEN_BINARY);
else if (STRINGP (error_file))
{
- fd_error = open ((CONST char *) XSTRING_DATA (error_file),
+ fd_error = open ((const char *) XSTRING_DATA (error_file),
#ifdef DOS_NT
O_WRONLY | O_TRUNC | O_CREAT | O_TEXT,
S_IREAD | S_IWRITE
#ifdef DOS_NT
O_WRONLY | O_TRUNC | O_CREAT | O_TEXT,
S_IREAD | S_IWRITE
@@
-608,7
+608,7
@@
int
void
#endif
child_setup (int in, int out, int err, char **new_argv,
void
#endif
child_setup (int in, int out, int err, char **new_argv,
- CONST char *current_dir)
+ const char *current_dir)
{
char **env;
char *pwd;
{
char **env;
char *pwd;
@@
-763,8
+763,8
@@
child_setup (int in, int out, int err, char **new_argv,
#ifdef WINDOWSNT
/* Spawn the child. (See ntproc.c:Spawnve). */
#ifdef WINDOWSNT
/* Spawn the child. (See ntproc.c:Spawnve). */
- cpid = spawnve (_P_NOWAIT, new_argv[0], (CONST char* CONST*)new_argv,
- (CONST char* CONST*)env);
+ cpid = spawnve (_P_NOWAIT, new_argv[0], (const char* const*)new_argv,
+ (const char* const*)env);
if (cpid == -1)
/* An error occurred while trying to spawn the process. */
report_file_error ("Spawning child process", Qnil);
if (cpid == -1)
/* An error occurred while trying to spawn the process. */
report_file_error ("Spawning child process", Qnil);
@@
-783,7
+783,7
@@
child_setup (int in, int out, int err, char **new_argv,
}
static int
}
static int
-getenv_internal (CONST Bufbyte *var,
+getenv_internal (const Bufbyte *var,
Bytecount varlen,
Bufbyte **value,
Bytecount *valuelen)
Bytecount varlen,
Bufbyte **value,
Bytecount *valuelen)
@@
-846,12
+846,12
@@
When invoked interactively, prints the value in the echo area.
/* A version of getenv that consults process_environment, easily
callable from C. */
char *
/* A version of getenv that consults process_environment, easily
callable from C. */
char *
-egetenv (CONST char *var)
+egetenv (const char *var)
{
Bufbyte *value;
Bytecount valuelen;
{
Bufbyte *value;
Bytecount valuelen;
- if (getenv_internal ((CONST Bufbyte *) var, strlen (var), &value, &valuelen))
+ if (getenv_internal ((const Bufbyte *) var, strlen (var), &value, &valuelen))
return (char *) value;
else
return 0;
return (char *) value;
else
return 0;
@@
-876,10
+876,10
@@
init_callproc (void)
{
/* Initialize shell-file-name from environment variables or best guess. */
#ifdef WINDOWSNT
{
/* Initialize shell-file-name from environment variables or best guess. */
#ifdef WINDOWSNT
- CONST char *shell = egetenv ("COMSPEC");
+ const char *shell = egetenv ("COMSPEC");
if (!shell) shell = "\\WINNT\\system32\\cmd.exe";
#else /* not WINDOWSNT */
if (!shell) shell = "\\WINNT\\system32\\cmd.exe";
#else /* not WINDOWSNT */
- CONST char *shell = egetenv ("SHELL");
+ const char *shell = egetenv ("SHELL");
if (!shell) shell = "/bin/sh";
#endif
if (!shell) shell = "/bin/sh";
#endif
@@
-906,7
+906,7
@@
set_process_environment (void)
void
syms_of_callproc (void)
{
void
syms_of_callproc (void)
{
- DEFSUBR (Fcall_process_internal);
+ DEFSUBR (Fold_call_process_internal);
DEFSUBR (Fgetenv);
}
DEFSUBR (Fgetenv);
}