Overview
| Comment: | More work towards SQLite3 integration |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
76ac4557f6f5e2060d541783803b3261 |
| User & Date: | rkeene on 2014-09-08 04:34:40 |
| Other Links: | manifest | tags |
Context
|
2014-09-08
| ||
| 06:12 | Updated to print packages check-in: 654957c655 user: rkeene tags: trunk | |
| 04:34 | More work towards SQLite3 integration check-in: 76ac4557f6 user: rkeene tags: trunk | |
| 04:25 | Working on creating an SQLite interface check-in: 676f99c72e user: rkeene tags: trunk | |
Changes
Modified Makefile from [71d33fb8c0] to [bf41e80612].
1 2 | CC = gcc PKG_CONFIG = pkg-config | | | | 1 2 3 4 5 6 7 8 9 10 11 12 | CC = gcc PKG_CONFIG = pkg-config CFLAGS = -Wall -g3 $(shell $(PKG_CONFIG) --cflags fuse) $(shell $(PKG_CONFIG) --cflags sqlite3) $(TCL_CFLAGS) LDFLAGS = $(TCL_LDFLAGS) LIBS = $(shell $(PKG_CONFIG) --libs fuse) $(shell $(PKG_CONFIG) --libs sqlite3) $(TCL_LIBS) PREFIX = /usr/local prefix = $(PREFIX) bindir = $(prefix)/bin ifneq ($(TCLKIT_SDK_DIR),) TCLCONFIG_SH_PATH = $(TCLKIT_SDK_DIR)/lib/tclConfig.sh TCL_LDFLAGS = -Wl,-R,$(TCLKIT_SDK_DIR)/lib |
| ︙ | ︙ |
Modified appfs.c from [8a456b75d5] to [d2a493f839].
| ︙ | ︙ | |||
222 223 224 225 226 227 228 |
.readdir = appfs_fuse_readdir,
.open = appfs_fuse_open,
.read = appfs_fuse_read
};
int main(int argc, char **argv) {
const char *cachedir = APPFS_CACHEDIR;
| > | | 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 |
.readdir = appfs_fuse_readdir,
.open = appfs_fuse_open,
.read = appfs_fuse_read
};
int main(int argc, char **argv) {
const char *cachedir = APPFS_CACHEDIR;
char dbfilename[1024];
int tcl_ret, snprintf_ret, sqlite_ret;
globalThread.interp = Tcl_CreateInterp();
if (globalThread.interp == NULL) {
fprintf(stderr, "Unable to create Tcl Interpreter. Aborting.\n");
return(1);
}
|
| ︙ | ︙ | |||
259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 |
}
tcl_ret = appfs_Tcl_Eval(globalThread.interp, 1, "::appfs::init");
if (tcl_ret != TCL_OK) {
fprintf(stderr, "Unable to initialize Tcl AppFS script (::appfs::init). Aborting.\n");
fprintf(stderr, "Tcl Error is: %s\n", Tcl_GetStringResult(globalThread.interp));
return(1);
}
#ifdef APPFS_TEST_DRIVER
return(appfs_test_driver());
#else
return(fuse_main(argc, argv, &appfs_oper, NULL));
#endif
}
| > > > > > > > > > > > > > > | 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 |
}
tcl_ret = appfs_Tcl_Eval(globalThread.interp, 1, "::appfs::init");
if (tcl_ret != TCL_OK) {
fprintf(stderr, "Unable to initialize Tcl AppFS script (::appfs::init). Aborting.\n");
fprintf(stderr, "Tcl Error is: %s\n", Tcl_GetStringResult(globalThread.interp));
return(1);
}
snprintf_ret = snprintf(dbfilename, sizeof(dbfilename), "%s/%s", cachedir, "cache.db");
if (snprintf_ret >= sizeof(dbfilename)) {
fprintf(stderr, "Unable to set database filename. Aborting.\n");
return(1);
}
sqlite_ret = sqlite3_open(dbfilename, &globalThread.db);
if (sqlite_ret != SQLITE_OK) {
fprintf(stderr, "Unable to open database: %s\n", dbfilename);
return(1);
}
#ifdef APPFS_TEST_DRIVER
return(appfs_test_driver());
#else
return(fuse_main(argc, argv, &appfs_oper, NULL));
#endif
}
|