[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3265 - in GNUnet: . src/applications/sqstore_mysql
From: |
grothoff |
Subject: |
[GNUnet-SVN] r3265 - in GNUnet: . src/applications/sqstore_mysql |
Date: |
Sun, 20 Aug 2006 12:28:06 -0700 (PDT) |
Author: grothoff
Date: 2006-08-20 12:27:59 -0700 (Sun, 20 Aug 2006)
New Revision: 3265
Modified:
GNUnet/src/applications/sqstore_mysql/mysql.c
GNUnet/todo
Log:
fixing mysql
Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c 2006-08-20 04:14:31 UTC
(rev 3264)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c 2006-08-20 19:27:59 UTC
(rev 3265)
@@ -272,10 +272,13 @@
mysql_options(dbhI->dbf,
MYSQL_READ_DEFAULT_GROUP,
"client");
- dbname = getConfigurationString("MYSQL",
- "DATABASE");
- if (dbname == NULL)
- dbname = STRDUP("gnunet");
+ dbname = NULL;
+ GC_get_configuration_value_string(coreAPI->cfg,
+ "MYSQL",
+ "DATABASE",
+ "gnunet",
+ &dbname);
+ GE_ASSERT(ectx, dbname != NULL);
mysql_real_connect(dbhI->dbf,
NULL,
NULL,
@@ -1169,7 +1172,7 @@
FILE * fp;
struct passwd * pw;
size_t nX;
- char *home_dir;
+ char * home_dir;
ectx = capi->ectx;
coreAPI = capi;
@@ -1185,28 +1188,29 @@
GE_DIE_STRERROR(ectx,
GE_FATAL | GE_ADMIN | GE_IMMEDIATE,
"getpwuid");
- home_dir = pw->pw_dir;
+ home_dir = STRDUP(pw->pw_dir);
#else
home_dir = (char *) MALLOC(_MAX_PATH + 1);
plibc_conv_to_win_path("~/", home_dir);
#endif
- nX = strlen(home_dir)+1024;
- cnffile = getConfigurationString("MYSQL",
- "CONFIG");
- if (cnffile == NULL) {
- cnffile = MALLOC(nX);
- SNPRINTF(cnffile, nX, "%s/.my.cnf", home_dir);
- } else {
- char * ex = string_expandFileName(ectx, cnffile);
- FREE(cnffile);
- cnffile = ex;
- }
-#ifdef WINDOWS
+ nX = strlen(home_dir)+10;
+ cnffile = MALLOC(nX);
+ SNPRINTF(cnffile,
+ nX,
+ "%s/.my.cnf",
+ home_dir);
FREE(home_dir);
-#endif
- GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
- _("Trying to use file `%s' for MySQL configuration.\n"),
- cnffile);
+ GC_get_configuration_value_filename(capi->cfg,
+ "MYSQL",
+ "CONFIG",
+ cnffile,
+ &home_dir);
+ FREE(cnffile);
+ cnffile = home_dir;
+ GE_LOG(ectx,
+ GE_DEBUG | GE_REQUEST | GE_USER,
+ _("Trying to use file `%s' for MySQL configuration.\n"),
+ cnffile);
fp = FOPEN(cnffile, "r");
if (!fp) {
GE_LOG_STRERROR_FILE(ectx, GE_ERROR | GE_ADMIN | GE_BULK, "fopen",
cnffile);
Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2006-08-20 04:14:31 UTC (rev 3264)
+++ GNUnet/todo 2006-08-20 19:27:59 UTC (rev 3265)
@@ -28,7 +28,8 @@
stats, topology_default, state, getoption, advertising,
traffic, ecrs_core, template, tbench, tracekit, fs/fslib,
fs/module, gap, fs/ecrs, fs/uritrack, fs/namespace,
- fs/fsui, fs/collection, fs/tools, bootstrap_http compile
+ fs/fsui, fs/collection, fs/tools, bootstrap_http,
+ sqstore_mysql compile
+ fs/fsui, fs/collection, fs/uritrack, fs/namespace
must still be revised to match new API!
+ rest: sqstore_mysql, dht, rpc, topology_f2f, vpn
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3265 - in GNUnet: . src/applications/sqstore_mysql,
grothoff <=