Make strdup work for Ultrix. Thanks Erik Bertelsen

This commit is contained in:
Bryan Henderson 1996-11-28 03:32:18 +00:00
parent 0667fd9491
commit f0e7004d29
3 changed files with 7 additions and 20 deletions

View File

@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.10 1996/11/26 07:38:16 bryanh Exp $
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.11 1996/11/28 03:31:27 bryanh Exp $
#
#-------------------------------------------------------------------------
@ -27,7 +27,7 @@ pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a
$(CC) $(LDFLAGS) -o pg_dump -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD)
../../utils/strdup.o:
$(MAKE) -C ../../utils/strdup.o
$(MAKE) -C ../../utils strdup.o
.PHONY: submake
submake:

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.21 1996/11/26 07:38:55 bryanh Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.22 1996/11/28 03:32:12 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@ -34,20 +34,6 @@
#include "strdup.h"
#endif
#if defined(ultrix4) || defined(next)
/* ultrix is lame and doesn't have strdup in libc for some reason */
/* [TRH] So doesn't NEXTSTEP. But whaddaya expect for a non-ANSI
standard function? (My, my. Touchy today, are we?) */
char *
strdup(const char *string)
{
char *nstr;
if ((nstr = malloc(strlen(string)+1)) != NULL)
strcpy(nstr, string);
return nstr;
}
#endif
/* use a local version instead of the one found in pqpacket.c */
static ConnStatusType connectDB(PGconn *conn);

View File

@ -7,18 +7,19 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/utils/Attic/strdup.c,v 1.1 1996/11/27 01:46:52 bryanh Exp $
* $Header: /cvsroot/pgsql/src/utils/Attic/strdup.c,v 1.2 1996/11/28 03:32:18 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
#include <stdlib.h>
#include "strdup.h"
char *
strdup(char *string)
strdup(char const *string)
{
char *nstr;
nstr = strcpy((char *)palloc(strlen(string)+1), string);
nstr = strcpy((char *)malloc(strlen(string)+1), string);
return nstr;
}