projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Override <sys/socket.h> when it exists but is incomplete.
[gnulib.git]
/
lib
/
progname.c
diff --git
a/lib/progname.c
b/lib/progname.c
index
ea32128
..
2b77a58
100644
(file)
--- a/
lib/progname.c
+++ b/
lib/progname.c
@@
-1,11
+1,11
@@
/* Program name management.
/* Program name management.
- Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2005
-2008
Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
- This program is free software
;
you can redistribute it and/or modify
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,21
+13,17
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
/* Specification. */
/* Specification. */
+#undef ENABLE_RELOCATABLE /* avoid defining set_program_name as a macro */
#include "progname.h"
#include <string.h>
#include "progname.h"
#include <string.h>
-#undef set_program_name
-
/* String containing name the program is called with.
To be initialized by main(). */
/* String containing name the program is called with.
To be initialized by main(). */
@@
-45,9
+41,11
@@
set_program_name (const char *argv0)
slash = strrchr (argv0, '/');
base = (slash != NULL ? slash + 1 : argv0);
slash = strrchr (argv0, '/');
base = (slash != NULL ? slash + 1 : argv0);
- if (base - argv0 >= 7 && memcmp (base - 7, "/.libs/", 7) == 0)
- argv0 = base;
- if (strncmp (base, "lt-", 3) == 0)
- argv0 = base + 3;
+ if (base - argv0 >= 7 && strncmp (base - 7, "/.libs/", 7) == 0)
+ {
+ argv0 = base;
+ if (strncmp (base, "lt-", 3) == 0)
+ argv0 = base + 3;
+ }
program_name = argv0;
}
program_name = argv0;
}