From: Friedrich L. <fr...@us...> - 2004-06-14 23:16:19
|
Update of /cvsroot/ipac-ng/ipac-ng/storage/sqlite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv849/storage/sqlite Modified Files: sqlite.c Log Message: put sqlite database file always into the ipac datadir /var/lib/ipac Index: sqlite.c =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/storage/sqlite/sqlite.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- sqlite.c 13 Jun 2004 01:14:31 -0000 1.1 +++ sqlite.c 14 Jun 2004 23:16:09 -0000 1.2 @@ -23,6 +23,8 @@ #include "ipac.h" #include "../sharedsql/sharedsql.h" #include <sqlite.h> +#include <unistd.h> +#include <string.h> static sqlite *conn; static char **res; @@ -62,9 +64,15 @@ static int sqlite_stor_open (int flag) { + char temp[256]; + sql_stor_open(); - conn = sqlite_open (dbname, 0, &err); + /* open database filename as sql database name plus suffix ".db" in + the ipac datadir so the database file ends up at the same place + all the time */ + conn = sqlite_open (strcat (strcat (strcat ( + strcpy (temp, datadir), "/"), dbname), ".db"), 0, &err); if (err) { fprintf (stderr, "Connection to database '%s' failed.\n", dbname); fprintf (stderr, "%s", err); |