diff options
| author | Tom Tromey <tromey@adacore.com> | 2022-04-18 09:44:18 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2022-04-18 10:14:04 -0600 |
| commit | dc6c21dabfbd242616b9e6266b459eded2d0762b (patch) | |
| tree | b2fbadbdbcd20dfa3f9dfe179db1c348e2aa5901 /gnulib/import/getprogname.c | |
| parent | 2390419d1cb72882110538e01e5586372df19657 (diff) | |
| download | binutils-dc6c21dabfbd242616b9e6266b459eded2d0762b.zip binutils-dc6c21dabfbd242616b9e6266b459eded2d0762b.tar.gz binutils-dc6c21dabfbd242616b9e6266b459eded2d0762b.tar.bz2 | |
Update gnulib
This updates gnulib to a relatively recent commit. Most of this was
done by the gnulib import script; the only change I made was to
update-gnulib.sh.
Tested on x86-64 Fedora 34. I also did a mingw cross build.
Diffstat (limited to 'gnulib/import/getprogname.c')
| -rw-r--r-- | gnulib/import/getprogname.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/gnulib/import/getprogname.c b/gnulib/import/getprogname.c index 500619d..62a4800 100644 --- a/gnulib/import/getprogname.c +++ b/gnulib/import/getprogname.c @@ -1,17 +1,17 @@ /* Program name management. - Copyright (C) 2016-2021 Free Software Foundation, Inc. + Copyright (C) 2016-2022 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 - the Free Software Foundation; either version 3 of the License, or + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Lesser General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include <config.h> @@ -43,7 +43,7 @@ # include <string.h> #endif -#ifdef __sgi +#if defined __sgi || defined __osf__ # include <string.h> # include <unistd.h> # include <stdio.h> @@ -224,11 +224,15 @@ getprogname (void) free (buf.ps_pathptr); } return p; -# elif defined __sgi /* IRIX */ +# elif defined __sgi || defined __osf__ /* IRIX or Tru64 */ char filename[50]; int fd; - sprintf (filename, "/proc/pinfo/%d", (int) getpid ()); + # if defined __sgi + sprintf (filename, "/proc/pinfo/%d", (int) getpid ()); + # else + sprintf (filename, "/proc/%d", (int) getpid ()); + # endif fd = open (filename, O_RDONLY | O_CLOEXEC); if (0 <= fd) { |