Changeset: 7b8968c47a65 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b8968c47a65
Modified Files:
sql/src/server/rel_updates.mx
Branch: Oct2010
Log Message:
Only declare variables when they're needed, and use correct length.
The man page for realpath (at least on Linux) says that the buffer has
to be PATH_MAX long.
diffs (29 lines):
diff -r c85f443877ac -r 7b8968c47a65 sql/src/server/rel_updates.mx
--- a/sql/src/server/rel_updates.mx Tue Dec 14 12:42:10 2010 +0100
+++ b/sql/src/server/rel_updates.mx Tue Dec 14 12:56:17 2010 +0100
@@ -592,8 +592,10 @@
return sql_error(sql, 02, "COPY INTO: database is in read-only
mode");
if (files) {
dnode *n = files->h;
- char realdbfarm[1024];
- char realfile[1024];
+#ifdef HAVE_REALPATH
+ char realdbfarm[PATH_MAX];
+ char realfile[PATH_MAX];
+#endif
if (sql->user_id != USER_MONETDB)
return sql_error(sql, 02, "COPY INTO: insufficient
privileges: "
@@ -739,8 +741,10 @@
static sql_rel *
copyto(mvc *sql, symbol *sq, str filename, dlist *seps, str null_string)
{
- char realdbfarm[1024];
- char realfile[1024];
+#ifdef HAVE_REALPATH
+ char realdbfarm[PATH_MAX];
+ char realfile[PATH_MAX];
+#endif
char *tsep = seps->h->data.sval;
char *rsep = seps->h->next->data.sval;
char *ssep = (seps->h->next->next)?seps->h->next->next->data.sval:"\"";
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
