[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/callproc.c
From: |
Ken Raeburn |
Subject: |
[Emacs-diffs] Changes to emacs/src/callproc.c |
Date: |
Sun, 14 Jul 2002 20:00:43 -0400 |
Index: emacs/src/callproc.c
diff -c emacs/src/callproc.c:1.190 emacs/src/callproc.c:1.191
*** emacs/src/callproc.c:1.190 Thu Jul 11 10:08:58 2002
--- emacs/src/callproc.c Sun Jul 14 20:00:35 2002
***************
*** 159,166 ****
register Lisp_Object file;
file = Fcdr (fdpid);
emacs_close (XFASTINT (Fcar (fdpid)));
! if (strcmp (XSTRING (file)-> data, NULL_DEVICE) != 0)
! unlink (XSTRING (file)->data);
#else /* not MSDOS and not MAC_OS8 */
register int pid = XFASTINT (Fcdr (fdpid));
--- 159,166 ----
register Lisp_Object file;
file = Fcdr (fdpid);
emacs_close (XFASTINT (Fcar (fdpid)));
! if (strcmp (SDATA (file), NULL_DEVICE) != 0)
! unlink (SDATA (file));
#else /* not MSDOS and not MAC_OS8 */
register int pid = XFASTINT (Fcdr (fdpid));
***************
*** 371,377 ****
display = nargs >= 4 ? args[3] : Qnil;
! filefd = emacs_open (XSTRING (infile)->data, O_RDONLY, 0);
if (filefd < 0)
{
report_file_error ("Opening process input file", Fcons (infile, Qnil));
--- 371,377 ----
display = nargs >= 4 ? args[3] : Qnil;
! filefd = emacs_open (SDATA (infile), O_RDONLY, 0);
if (filefd < 0)
{
report_file_error ("Opening process input file", Fcons (infile, Qnil));
***************
*** 389,395 ****
emacs_close (filefd);
report_file_error ("Searching for program", Fcons (args[0], Qnil));
}
! new_argv[0] = XSTRING (path)->data;
if (nargs > 4)
{
register int i;
--- 389,395 ----
emacs_close (filefd);
report_file_error ("Searching for program", Fcons (args[0], Qnil));
}
! new_argv[0] = SDATA (path);
if (nargs > 4)
{
register int i;
***************
*** 407,413 ****
if (argument_coding.type == coding_type_ccl)
setup_ccl_program (&(argument_coding.spec.ccl.encoder), Qnil);
}
! new_argv[i - 3] = XSTRING (args[i])->data;
}
UNGCPRO;
new_argv[nargs - 3] = 0;
--- 407,413 ----
if (argument_coding.type == coding_type_ccl)
setup_ccl_program (&(argument_coding.spec.ccl.encoder), Qnil);
}
! new_argv[i - 3] = SDATA (args[i]);
}
UNGCPRO;
new_argv[nargs - 3] = 0;
***************
*** 443,451 ****
#ifdef MAC_OS8
/* Since we don't have pipes on the Mac, create a temporary file to
hold the output of the subprocess. */
! tempfile = (char *) alloca (STRING_BYTES (XSTRING
(Vtemp_file_name_pattern)) + 1);
! bcopy (XSTRING (Vtemp_file_name_pattern)->data, tempfile,
! STRING_BYTES (XSTRING (Vtemp_file_name_pattern)) + 1);
mktemp (tempfile);
--- 443,451 ----
#ifdef MAC_OS8
/* Since we don't have pipes on the Mac, create a temporary file to
hold the output of the subprocess. */
! tempfile = (char *) alloca (SBYTES (Vtemp_file_name_pattern) + 1);
! bcopy (SDATA (Vtemp_file_name_pattern), tempfile,
! SBYTES (Vtemp_file_name_pattern) + 1);
mktemp (tempfile);
***************
*** 505,515 ****
else if (STRINGP (error_file))
{
#ifdef DOS_NT
! fd_error = emacs_open (XSTRING (error_file)->data,
O_WRONLY | O_TRUNC | O_CREAT | O_TEXT,
S_IREAD | S_IWRITE);
#else /* not DOS_NT */
! fd_error = creat (XSTRING (error_file)->data, 0666);
#endif /* not DOS_NT */
}
--- 505,515 ----
else if (STRINGP (error_file))
{
#ifdef DOS_NT
! fd_error = emacs_open (SDATA (error_file),
O_WRONLY | O_TRUNC | O_CREAT | O_TEXT,
S_IREAD | S_IWRITE);
#else /* not DOS_NT */
! fd_error = creat (SDATA (error_file), 0666);
#endif /* not DOS_NT */
}
***************
*** 545,559 ****
close (fd_error);
fd1 = -1; /* No harm in closing that one! */
! infn = XSTRING (infile)->data;
outfn = tempfile;
if (NILP (error_file))
errfn = NULL_DEVICE;
else if (EQ (Qt, error_file))
errfn = outfn;
else
! errfn = XSTRING (error_file)->data;
! currdn = XSTRING (current_dir)->data;
pid = run_mac_command (new_argv, currdn, infn, outfn, errfn);
/* Record that the synchronous process exited and note its
--- 545,559 ----
close (fd_error);
fd1 = -1; /* No harm in closing that one! */
! infn = SDATA (infile);
outfn = tempfile;
if (NILP (error_file))
errfn = NULL_DEVICE;
else if (EQ (Qt, error_file))
errfn = outfn;
else
! errfn = SDATA (error_file);
! currdn = SDATA (current_dir);
pid = run_mac_command (new_argv, currdn, infn, outfn, errfn);
/* Record that the synchronous process exited and note its
***************
*** 1047,1055 ****
strcat (tempfile, "detmp.XXX");
#endif
#else /* not DOS_NT */
! char *tempfile = (char *) alloca (STRING_BYTES (XSTRING
(Vtemp_file_name_pattern)) + 1);
! bcopy (XSTRING (Vtemp_file_name_pattern)->data, tempfile,
! STRING_BYTES (XSTRING (Vtemp_file_name_pattern)) + 1);
#endif /* not DOS_NT */
coding_systems = Qt;
--- 1047,1055 ----
strcat (tempfile, "detmp.XXX");
#endif
#else /* not DOS_NT */
! char *tempfile = (char *) alloca (SBYTES (Vtemp_file_name_pattern) + 1);
! bcopy (SDATA (Vtemp_file_name_pattern), tempfile,
! SBYTES (Vtemp_file_name_pattern) + 1);
#endif /* not DOS_NT */
coding_systems = Qt;
***************
*** 1188,1194 ****
register char *temp;
register int i;
! i = STRING_BYTES (XSTRING (current_dir));
#ifdef MSDOS
/* MSDOS must have all environment variables malloc'ed, because
low-level libc functions that launch subsidiary processes rely
--- 1188,1194 ----
register char *temp;
register int i;
! i = SBYTES (current_dir);
#ifdef MSDOS
/* MSDOS must have all environment variables malloc'ed, because
low-level libc functions that launch subsidiary processes rely
***************
*** 1199,1205 ****
#endif
temp = pwd_var + 4;
bcopy ("PWD=", pwd_var, 4);
! bcopy (XSTRING (current_dir)->data, temp, i);
if (!IS_DIRECTORY_SEP (temp[i - 1])) temp[i++] = DIRECTORY_SEP;
temp[i] = 0;
--- 1199,1205 ----
#endif
temp = pwd_var + 4;
bcopy ("PWD=", pwd_var, 4);
! bcopy (SDATA (current_dir), temp, i);
if (!IS_DIRECTORY_SEP (temp[i - 1])) temp[i++] = DIRECTORY_SEP;
temp[i] = 0;
***************
*** 1253,1259 ****
tem = XCDR (tem))
{
char **ep = env;
! char *string = (char *) XSTRING (XCAR (tem))->data;
/* See if this string duplicates any string already in the env.
If so, don't put it in.
When an env var has multiple definitions,
--- 1253,1259 ----
tem = XCDR (tem))
{
char **ep = env;
! char *string = (char *) SDATA (XCAR (tem));
/* See if this string duplicates any string already in the env.
If so, don't put it in.
When an env var has multiple definitions,
***************
*** 1280,1286 ****
}
#ifdef WINDOWSNT
prepare_standard_handles (in, out, err, handles);
! set_process_dir (XSTRING (current_dir)->data);
#else /* not WINDOWSNT */
/* Make sure that in, out, and err are not actually already in
descriptors zero, one, or two; this could happen if Emacs is
--- 1280,1286 ----
}
#ifdef WINDOWSNT
prepare_standard_handles (in, out, err, handles);
! set_process_dir (SDATA (current_dir));
#else /* not WINDOWSNT */
/* Make sure that in, out, and err are not actually already in
descriptors zero, one, or two; this could happen if Emacs is
***************
*** 1405,1422 ****
entry = XCAR (scan);
if (STRINGP (entry)
! && STRING_BYTES (XSTRING (entry)) > varlen
! && XSTRING (entry)->data[varlen] == '='
#ifdef WINDOWSNT
/* NT environment variables are case insensitive. */
! && ! strnicmp (XSTRING (entry)->data, var, varlen)
#else /* not WINDOWSNT */
! && ! bcmp (XSTRING (entry)->data, var, varlen)
#endif /* not WINDOWSNT */
)
{
! *value = (char *) XSTRING (entry)->data + (varlen + 1);
! *valuelen = STRING_BYTES (XSTRING (entry)) - (varlen + 1);
return 1;
}
}
--- 1405,1422 ----
entry = XCAR (scan);
if (STRINGP (entry)
! && SBYTES (entry) > varlen
! && SREF (entry, varlen) == '='
#ifdef WINDOWSNT
/* NT environment variables are case insensitive. */
! && ! strnicmp (SDATA (entry), var, varlen)
#else /* not WINDOWSNT */
! && ! bcmp (SDATA (entry), var, varlen)
#endif /* not WINDOWSNT */
)
{
! *value = (char *) SDATA (entry) + (varlen + 1);
! *valuelen = SBYTES (entry) - (varlen + 1);
return 1;
}
}
***************
*** 1435,1441 ****
int valuelen;
CHECK_STRING (var);
! if (getenv_internal (XSTRING (var)->data, STRING_BYTES (XSTRING (var)),
&value, &valuelen))
return make_string (value, valuelen);
else
--- 1435,1441 ----
int valuelen;
CHECK_STRING (var);
! if (getenv_internal (SDATA (var), SBYTES (var),
&value, &valuelen))
return make_string (value, valuelen);
else
***************
*** 1550,1562 ****
#endif
{
tempdir = Fdirectory_file_name (Vexec_directory);
! if (access (XSTRING (tempdir)->data, 0) < 0)
dir_warning ("Warning: arch-dependent data dir (%s) does not exist.\n",
Vexec_directory);
}
tempdir = Fdirectory_file_name (Vdata_directory);
! if (access (XSTRING (tempdir)->data, 0) < 0)
dir_warning ("Warning: arch-independent data dir (%s) does not exist.\n",
Vdata_directory);
--- 1550,1562 ----
#endif
{
tempdir = Fdirectory_file_name (Vexec_directory);
! if (access (SDATA (tempdir), 0) < 0)
dir_warning ("Warning: arch-dependent data dir (%s) does not exist.\n",
Vexec_directory);
}
tempdir = Fdirectory_file_name (Vdata_directory);
! if (access (SDATA (tempdir), 0) < 0)
dir_warning ("Warning: arch-independent data dir (%s) does not exist.\n",
Vdata_directory);
- [Emacs-diffs] Changes to emacs/src/callproc.c, Dave Love, 2002/07/03
- [Emacs-diffs] Changes to emacs/src/callproc.c, Kenichi Handa, 2002/07/08
- [Emacs-diffs] Changes to emacs/src/callproc.c, Kenichi Handa, 2002/07/08
- [Emacs-diffs] Changes to emacs/src/callproc.c, Juanma Barranquero, 2002/07/11
- [Emacs-diffs] Changes to emacs/src/callproc.c,
Ken Raeburn <=
- [Emacs-diffs] Changes to emacs/src/callproc.c, Ken Raeburn, 2002/07/19
- [Emacs-diffs] Changes to emacs/src/callproc.c, Richard M. Stallman, 2002/07/21
- [Emacs-diffs] Changes to emacs/src/callproc.c, Juanma Barranquero, 2002/07/22
- [Emacs-diffs] Changes to emacs/src/callproc.c, Kenichi Handa, 2002/07/31