1
0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00

Change some ABORTS to ERROR. Add line number when COPY Failure.

This commit is contained in:
Bruce Momjian
1998-01-05 16:40:20 +00:00
parent 3d8820a364
commit deea69b90e
44 changed files with 571 additions and 589 deletions

View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.12 1998/01/05 03:34:06 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.13 1998/01/05 16:39:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,7 +48,7 @@ filename_in(char *file)
if ((pw = getpwnam(userName)) == NULL)
{
elog(ABORT, "User %s is not a Unix user on the db server.",
elog(ERROR, "User %s is not a Unix user on the db server.",
userName);
}
@@ -77,7 +77,7 @@ filename_in(char *file)
/* printf("name: %s\n"); */
if ((pw = getpwnam(name)) == NULL)
{
elog(ABORT, "No such user: %s\n", name);
elog(ERROR, "No such user: %s\n", name);
ind = 0;
}
else
@@ -112,7 +112,7 @@ filename_in(char *file)
}
else
{
elog(ABORT, "Couldn't find %s in your environment", environment);
elog(ERROR, "Couldn't find %s in your environment", environment);
}
}
else
@@ -132,6 +132,6 @@ filename_out(char *s)
return ((char *) NULL);
ret = (char *) palloc(strlen(s) + 1);
if (!ret)
elog(ABORT, "filename_out: palloc failed");
elog(ERROR, "filename_out: palloc failed");
return (strcpy(ret, s));
}