Changes In Branch internal_sha1 Excluding Merge-Ins
This is equivalent to a diff from cc5a68a6de to 853a9068a7
|
2014-11-06
| ||
| 16:20 | Merged in internal_sha1 branch since we should use that as the basis going forward check-in: 5ffd966f05 user: rkeene tags: tcl-ops | |
| 02:49 | Updated to indicate only that packaged files are writable check-in: 97e72202db user: rkeene tags: trunk | |
| 02:29 | Updated to use C-based implementation of SHA1 Closed-Leaf check-in: 853a9068a7 user: rkeene tags: internal_sha1 | |
| 00:37 | Merged in updates from trunk check-in: ee9eb7ed98 user: rkeene tags: internal_sha1 | |
|
2014-11-05
| ||
| 21:41 | Fixed cleanup issue which was causing excessive lookups check-in: cc5a68a6de user: rkeene tags: trunk | |
| 21:41 | Added "package" command back, needed for older versions of "http" package check-in: b1167b6699 user: rkeene tags: trunk | |
Modified .fossil-settings/ignore-glob from [5155de6731] to [6f815d9a84].
1 2 3 | 1 2 3 4 5 | + + | appfsd appfsd.o appfsd.tcl.h sha1.o sha1.tcl.h |
Modified Makefile from [bee1193267] to [a8fe70a2c7].
| ︙ | |||
20 21 22 23 24 25 26 | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | - - + + + + + - - - + + + + |
TCLCONFIG_SH_PATH = $(shell echo 'puts [::tcl::pkgconfig get libdir,install]' | tclsh)/tclConfig.sh
endif
TCL_CFLAGS = $(shell . $(TCLCONFIG_SH_PATH); echo "$${TCL_INCLUDE_SPEC}")
TCL_LIBS = $(shell . $(TCLCONFIG_SH_PATH); echo "$${TCL_LIB_SPEC}")
all: appfsd
|
Modified appfsd.c from [72840611b5] to [f25bb5c801].
| ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | + + + |
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <fuse.h>
#include <pwd.h>
#include <tcl.h>
/* From sha1.c */
int Sha1_Init(Tcl_Interp *interp);
#ifndef APPFS_CACHEDIR
#define APPFS_CACHEDIR "/var/cache/appfs"
#endif
#ifdef DEBUG
#define APPFS_DEBUG(x...) { fprintf(stderr, "[debug] %s:%i:%s: ", __FILE__, __LINE__, __func__); fprintf(stderr, x); fprintf(stderr, "\n"); }
#else
|
| ︙ | |||
91 92 93 94 95 96 97 98 99 100 101 102 103 104 | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | + + + + + + + + + + + |
return(NULL);
}
tcl_ret = Tcl_Init(interp);
if (tcl_ret != TCL_OK) {
fprintf(stderr, "Unable to initialize Tcl. Aborting.\n");
fprintf(stderr, "Tcl Error is: %s\n", Tcl_GetStringResult(interp));
Tcl_DeleteInterp(interp);
return(NULL);
}
tcl_ret = Tcl_Eval(interp, "package ifneeded sha1 1.0 [list load {} sha1]");
if (tcl_ret != TCL_OK) {
fprintf(stderr, "Unable to initialize Tcl SHA1. Aborting.\n");
fprintf(stderr, "Tcl Error is: %s\n", Tcl_GetStringResult(interp));
Tcl_DeleteInterp(interp);
return(NULL);
}
tcl_ret = Tcl_Eval(interp, ""
|
| ︙ | |||
1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 | 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 | + + |
char dbfilename[1024];
int pthread_ret, snprintf_ret, sqlite_ret;
globalThread.cachedir = cachedir;
globalThread.boottime = time(NULL);
globalThread.platform = "linux-x86_64";
globalThread.options.writable = 1;
Tcl_StaticPackage(NULL, "sha1", Sha1_Init, NULL);
pthread_ret = pthread_key_create(&interpKey, NULL);
if (pthread_ret != 0) {
fprintf(stderr, "Unable to create TSD key for Tcl. Aborting.\n");
return(1);
}
|
| ︙ |
Modified appfsd.tcl from [86cb2b92c8] to [1a0526f9cf].
1 2 3 4 | 1 2 3 4 5 6 7 8 9 10 11 12 | - - - + - - - - | #! /usr/bin/env tclsh package require http 2.7 package require sqlite3 |
| ︙ |
Added sha1.c version [a59d293e66].