Commit fb5be867 authored by Bruce Momjian's avatar Bruce Momjian

LO patches for loimport/loexport from Raymond Toy

parent f4161503
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.9 1997/05/06 07:16:21 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.10 1997/06/10 13:01:32 momjian Exp $
* *
* NOTES * NOTES
* This should be moved to a more appropriate place. It is here * This should be moved to a more appropriate place. It is here
...@@ -257,11 +257,11 @@ lo_import(text *filename) ...@@ -257,11 +257,11 @@ lo_import(text *filename)
/* /*
* open the file to be read in * open the file to be read in
*/ */
strncpy(fnamebuf, VARDATA(filename), VARSIZE(filename)); strncpy(fnamebuf, VARDATA(filename), VARSIZE(filename) - VARHDRSZ);
fnamebuf[VARSIZE(filename)] = '\0'; fnamebuf[VARSIZE(filename) - VARHDRSZ] = '\0';
fd = open(fnamebuf, O_RDONLY, 0666); fd = open(fnamebuf, O_RDONLY, 0666);
if (fd < 0) { /* error */ if (fd < 0) { /* error */
elog(WARN, "lo_import: can't open unix file\"%s\"\n", elog(WARN, "be_lo_import: can't open unix file\"%s\"\n",
fnamebuf); fnamebuf);
} }
...@@ -325,8 +325,8 @@ lo_export(Oid lobjId, text *filename) ...@@ -325,8 +325,8 @@ lo_export(Oid lobjId, text *filename)
* open the file to be written to * open the file to be written to
*/ */
oumask = umask((mode_t) 0); oumask = umask((mode_t) 0);
strncpy(fnamebuf, VARDATA(filename), VARSIZE(filename)); strncpy(fnamebuf, VARDATA(filename), VARSIZE(filename) - VARHDRSZ);
fnamebuf[VARSIZE(filename)] = '\0'; fnamebuf[VARSIZE(filename) - VARHDRSZ] = '\0';
fd = open(fnamebuf, O_CREAT|O_WRONLY, 0666); fd = open(fnamebuf, O_CREAT|O_WRONLY, 0666);
(void) umask(oumask); (void) umask(oumask);
if (fd < 0) { /* error */ if (fd < 0) { /* error */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment