Overview
| Comment: | Removed dead code |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | fdd60b8c90a508c3cde772205b7335be7f7ab182 |
| User & Date: | rkeene on 2014-09-10 07:47:07 |
| Other Links: | manifest | tags |
Context
|
2014-09-10
| ||
| 07:52 | Implemented basic close mechanism check-in: e236f4717a user: rkeene tags: trunk | |
| 07:47 | Removed dead code check-in: fdd60b8c90 user: rkeene tags: trunk | |
| 07:42 | Renamed index generator to "mkfs" check-in: 475a868eae user: rkeene tags: trunk | |
Changes
Modified Makefile from [bfa3d240c3] to [93a7ad3349].
1 2 3 4 5 6 7 8 9 10 |
CC = gcc
PKG_CONFIG = pkg-config
CFLAGS = -Wall -g3 -ggdb3 $(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),)
|
| |
1 2 3 4 5 6 7 8 9 10 |
CC = gcc PKG_CONFIG = pkg-config CFLAGS = -Wall $(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),) |
Modified appfsd.c from [2342477e32] to [3805f48036].
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 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 .. 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 ... 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 ... 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 |
sqlite3 *db; const char *cachedir; time_t boottime; }; struct appfs_thread_data globalThread; typedef enum { APPFS_OS_UNKNOWN, APPFS_OS_ALL, APPFS_OS_LINUX, APPFS_OS_MACOSX, APPFS_OS_FREEBSD, APPFS_OS_OPENBSD, APPFS_OS_SOLARIS } appfs_os_t; typedef enum { APPFS_CPU_UNKNOWN, APPFS_CPU_ALL, APPFS_CPU_AMD64, APPFS_CPU_I386, APPFS_CPU_ARM } appfs_cpuArch_t; typedef enum { APPFS_PATHTYPE_INVALID, APPFS_PATHTYPE_FILE, APPFS_PATHTYPE_DIRECTORY, APPFS_PATHTYPE_SYMLINK } appfs_pathtype_t; struct appfs_package { struct appfs_package *_next; int counter; char name[256]; char version[64]; char sha1[41]; char os_str[64]; char cpuArch_str[64]; appfs_os_t os; appfs_cpuArch_t cpuArch; int isLatest; }; struct appfs_site { struct appfs_site *_next; int counter; char name[256]; }; struct appfs_children { struct appfs_children *_next; int counter; char name[256]; }; ................................................................................ struct appfs_sqlite3_query_cb_handle { struct appfs_children *head; int argc; const char *fmt; }; static appfs_os_t appfs_convert_os_fromString(const char *os) { if (strcasecmp(os, "Linux") == 0) { return(APPFS_OS_LINUX); } if (strcasecmp(os, "Darwin") == 0 || strcasecmp(os, "Mac OS") == 0 || strcasecmp(os, "Mac OS X") == 0) { return(APPFS_OS_MACOSX); } if (strcasecmp(os, "noarch") == 0) { return(APPFS_OS_ALL); } return(APPFS_OS_UNKNOWN); } static const char *appfs_convert_os_toString(appfs_os_t os) { switch (os) { case APPFS_OS_ALL: return("noarch"); case APPFS_OS_LINUX: return("linux"); case APPFS_OS_MACOSX: return("macosx"); case APPFS_OS_FREEBSD: return("freebsd"); case APPFS_OS_OPENBSD: return("openbsd"); case APPFS_OS_SOLARIS: return("freebsd"); case APPFS_CPU_UNKNOWN: return("unknown"); } return("unknown"); } static appfs_cpuArch_t appfs_convert_cpuArch_fromString(const char *cpu) { if (strcasecmp(cpu, "amd64") == 0 || strcasecmp(cpu, "x86_64") == 0) { return(APPFS_CPU_AMD64); } if (strcasecmp(cpu, "i386") == 0 || \ strcasecmp(cpu, "i486") == 0 || \ strcasecmp(cpu, "i586") == 0 || \ strcasecmp(cpu, "i686") == 0 || \ strcasecmp(cpu, "ix86") == 0) { return(APPFS_CPU_I386); } if (strcasecmp(cpu, "arm") == 0) { return(APPFS_CPU_ARM); } if (strcasecmp(cpu, "noarch") == 0) { return(APPFS_CPU_ALL); } return(APPFS_CPU_UNKNOWN); } static const char *appfs_convert_cpuArch_toString(appfs_cpuArch_t cpu) { switch (cpu) { case APPFS_CPU_ALL: return("noarch"); case APPFS_CPU_AMD64: return("amd64"); case APPFS_CPU_I386: return("ix86"); case APPFS_CPU_ARM: return("arm"); case APPFS_CPU_UNKNOWN: return("unknown"); } return("unknown"); } static Tcl_Interp *appfs_create_TclInterp(const char *cachedir) { Tcl_Interp *interp; int tcl_ret; interp = Tcl_CreateInterp(); if (interp == NULL) { fprintf(stderr, "Unable to create Tcl Interpreter. Aborting.\n"); ................................................................................ appfs_free_list_children(dir_children); return(0); } /* Get information about a path, and optionally list children */ static int appfs_get_path_info(const char *_path, struct appfs_pathinfo *pathinfo, struct appfs_children **children) { struct appfs_children *dir_children; appfs_os_t os_val; appfs_cpuArch_t cpuArch_val; char *hostname, *packagename, *os_cpuArch, *os, *cpuArch, *version; char *path, *path_s; char *package_hash; char *sql; int files_count; int fileinfo_ret, retval; ................................................................................ } os = os_cpuArch; cpuArch = strchr(os_cpuArch, '-'); if (cpuArch) { *cpuArch = '\0'; cpuArch++; cpuArch_val = appfs_convert_cpuArch_fromString(cpuArch); } else { cpuArch_val = APPFS_CPU_UNKNOWN; } os_val = appfs_convert_os_fromString(os); if (version == NULL) { /* Request for version list for a package on an OS/CPU */ appfs_update_index(hostname); sql = sqlite3_mprintf("SELECT DISTINCT version FROM packages WHERE hostname = %Q AND package = %Q AND os = %Q and cpuArch = %Q;", hostname, packagename, os, cpuArch); free(path_s); |
< < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < | < < < |
23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 .. 59 60 61 62 63 64 65 66 67 68 69 70 71 72 ... 527 528 529 530 531 532 533 534 535 536 537 538 539 540 ... 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 |
sqlite3 *db;
const char *cachedir;
time_t boottime;
};
struct appfs_thread_data globalThread;
typedef enum {
APPFS_PATHTYPE_INVALID,
APPFS_PATHTYPE_FILE,
APPFS_PATHTYPE_DIRECTORY,
APPFS_PATHTYPE_SYMLINK
} appfs_pathtype_t;
struct appfs_children {
struct appfs_children *_next;
int counter;
char name[256];
};
................................................................................
struct appfs_sqlite3_query_cb_handle {
struct appfs_children *head;
int argc;
const char *fmt;
};
static Tcl_Interp *appfs_create_TclInterp(const char *cachedir) {
Tcl_Interp *interp;
int tcl_ret;
interp = Tcl_CreateInterp();
if (interp == NULL) {
fprintf(stderr, "Unable to create Tcl Interpreter. Aborting.\n");
................................................................................
appfs_free_list_children(dir_children);
return(0);
}
/* Get information about a path, and optionally list children */
static int appfs_get_path_info(const char *_path, struct appfs_pathinfo *pathinfo, struct appfs_children **children) {
struct appfs_children *dir_children;
char *hostname, *packagename, *os_cpuArch, *os, *cpuArch, *version;
char *path, *path_s;
char *package_hash;
char *sql;
int files_count;
int fileinfo_ret, retval;
................................................................................
}
os = os_cpuArch;
cpuArch = strchr(os_cpuArch, '-');
if (cpuArch) {
*cpuArch = '\0';
cpuArch++;
}
if (version == NULL) {
/* Request for version list for a package on an OS/CPU */
appfs_update_index(hostname);
sql = sqlite3_mprintf("SELECT DISTINCT version FROM packages WHERE hostname = %Q AND package = %Q AND os = %Q and cpuArch = %Q;", hostname, packagename, os, cpuArch);
free(path_s);
|