mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-29 19:48:19 +00:00
Code Issues Releases Activity

(main): Call strerror instead of using sys_errlist.

Browse Source
This commit is contained in:
Roland McGrath 1994-01-08 21:47:36 +00:00
parent 92af894ffd
commit be06db9a3e
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib-src/env.c
View File

@ -1,5 +1,5 @@
/* env - manipulate environment and execute a program in that environment
Copyright (C) 1986 Free Software Foundation, Inc.
Copyright (C) 1986, 1994 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -59,7 +59,7 @@
{ USER=rms EDITOR=emacs PATH=.:/gnubin:/hacks }
* "env DISPLAY=gnu:0 nemacs"
calls "nemacs" in the envionment
calls "nemacs" in the environment
{ USER=rms EDITOR=emacs PATH=.:/gnubin:/hacks DISPLAY=gnu:0 }
* "env - USER=foo /hacks/hack bar baz"
@ -194,17 +194,14 @@ main (argc, argv, envp)
}
else
{
extern int errno, sys_nerr;
extern char *sys_errlist[];
extern int errno;
extern char *strerror ();
environ = nenv;
(void) execvp (*argv, argv);
fprintf (stderr, "%s: cannot execute `%s'", progname, *argv);
if (errno < sys_nerr)
fprintf (stderr, ": %s\n", sys_errlist[errno]);
else
putc ('\n', stderr);
fprintf (stderr, "%s: cannot execute `%s': %s\n",
progname, *argv, strerror (errno));
exit (errno != 0 ? errno : 1);
}
}

11
src/emacs.c
View File

@ -1,5 +1,5 @@
/* Fully extensible Emacs, running on Unix, intended for GNU.
Copyright (C) 1985, 1986, 1987, 1993 Free Software Foundation, Inc.
Copyright (C) 1985, 1986, 1987, 1993, 1994 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@ -260,7 +260,7 @@ main (argc, argv, envp)
int skip_args = 0;
extern int errno;
extern sys_nerr;
extern char *sys_errlist[];
extern char *strerror ();
extern void malloc_warning ();
/* Map in shared memory, if we are using that. */
@ -397,12 +397,7 @@ main (argc, argv, envp)
result = open (argv[skip_args], O_RDWR, 2 );
if (result < 0)
{
char *errstring;
if (errno >= 0 && errno < sys_nerr)
errstring = sys_errlist[errno];
else
errstring = "undocumented error code";
char *errstring = strerror (errno);
fprintf (stderr, "emacs: %s: %s\n", argv[skip_args], errstring);
exit (1);
}