diff options
| author | steve <steve@FreeBSD.org> | 1998-12-24 18:19:47 +0000 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 1998-12-24 18:19:47 +0000 |
| commit | 467e88b19d0ec5b2cbc8ce80aedd3f043a737db0 (patch) | |
| tree | e348a8c605d1c14ad57ce90abb3465e5d1035ff8 /lib/csu | |
| parent | bd6e00f32c1396ba37a00fd8a952320e177de158 (diff) | |
| download | FreeBSD-src-467e88b19d0ec5b2cbc8ce80aedd3f043a737db0.zip FreeBSD-src-467e88b19d0ec5b2cbc8ce80aedd3f043a737db0.tar.gz | |
Strip the leading path from __progname as is done in the a.out case. Also
bring in stddef.h so we can use NULL instead of 0 for pointer comparisons.
Hinted at by: Bruce Evans
Reviewed by: John Polstra
Diffstat (limited to 'lib/csu')
| -rw-r--r-- | lib/csu/amd64/crt1.c | 12 | ||||
| -rw-r--r-- | lib/csu/i386-elf/crt1.c | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/lib/csu/amd64/crt1.c b/lib/csu/amd64/crt1.c index a303997..d1dd43d 100644 --- a/lib/csu/amd64/crt1.c +++ b/lib/csu/amd64/crt1.c @@ -22,13 +22,14 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: crt1.c,v 1.1.1.1 1998/03/07 20:27:10 jdp Exp $ + * $Id: crt1.c,v 1.2 1998/09/07 23:31:59 jdp Exp $ */ #ifndef __GNUC__ #error "GCC is needed to compile this file" #endif +#include <stddef.h> #include <stdlib.h> typedef void (*fptr)(void); @@ -72,10 +73,15 @@ _start(char *arguments, ...) argc = * (int *) (argv - 1); env = argv + argc + 1; environ = env; - if(argc > 0) + if(argc > 0 && argv[0] != NULL) { + char *s; __progname = argv[0]; + for (s = __progname; *s != '\0'; s++) + if (*s == '/') + __progname = s + 1; + } - if(&_DYNAMIC != 0) + if(&_DYNAMIC != NULL) atexit(rtld_cleanup); #ifdef GCRT diff --git a/lib/csu/i386-elf/crt1.c b/lib/csu/i386-elf/crt1.c index a303997..d1dd43d 100644 --- a/lib/csu/i386-elf/crt1.c +++ b/lib/csu/i386-elf/crt1.c @@ -22,13 +22,14 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: crt1.c,v 1.1.1.1 1998/03/07 20:27:10 jdp Exp $ + * $Id: crt1.c,v 1.2 1998/09/07 23:31:59 jdp Exp $ */ #ifndef __GNUC__ #error "GCC is needed to compile this file" #endif +#include <stddef.h> #include <stdlib.h> typedef void (*fptr)(void); @@ -72,10 +73,15 @@ _start(char *arguments, ...) argc = * (int *) (argv - 1); env = argv + argc + 1; environ = env; - if(argc > 0) + if(argc > 0 && argv[0] != NULL) { + char *s; __progname = argv[0]; + for (s = __progname; *s != '\0'; s++) + if (*s == '/') + __progname = s + 1; + } - if(&_DYNAMIC != 0) + if(&_DYNAMIC != NULL) atexit(rtld_cleanup); #ifdef GCRT |
