[117190] trunk/base/src
jmr at macports.org
jmr at macports.org
Tue Feb 18 22:24:29 PST 2014
Revision: 117190
https://trac.macports.org/changeset/117190
Author: jmr at macports.org
Date: 2014-02-18 22:24:29 -0800 (Tue, 18 Feb 2014)
Log Message:
-----------
allow access to registry metadata from Tcl
Modified Paths:
--------------
trunk/base/src/cregistry/registry.c
trunk/base/src/cregistry/registry.h
trunk/base/src/registry2.0/registry.c
Modified: trunk/base/src/cregistry/registry.c
===================================================================
--- trunk/base/src/cregistry/registry.c 2014-02-19 06:01:08 UTC (rev 117189)
+++ trunk/base/src/cregistry/registry.c 2014-02-19 06:24:29 UTC (rev 117190)
@@ -456,3 +456,147 @@
sqlite3_close(db);
return result;
}
+
+/**
+ * Functions for access to the metadata table
+ */
+
+/**
+ * @param [in] reg registry to get value from
+ * @param [in] key metadata key to get
+ * @param [out] value the value of the metadata
+ * @param [out] errPtr on error, a description of the error that occurred
+ * @return true if success; false if failure
+ */
+int reg_get_metadata(reg_registry* reg, const char* key, char** value,
+ reg_error* errPtr) {
+ int result = 0;
+ sqlite3_stmt* stmt = NULL;
+ char* query = "SELECT value FROM registry.metadata WHERE key=?";
+ const char *text;
+ if (sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK
+ && (sqlite3_bind_text(stmt, 1, key, -1, SQLITE_STATIC) == SQLITE_OK)) {
+ int r;
+ do {
+ r = sqlite3_step(stmt);
+ switch (r) {
+ case SQLITE_ROW:
+ text = (const char*)sqlite3_column_text(stmt, 0);
+ if (text) {
+ *value = strdup(text);
+ result = 1;
+ } else {
+ reg_sqlite_error(reg->db, errPtr, query);
+ }
+ break;
+ case SQLITE_DONE:
+ errPtr->code = REG_NOT_FOUND;
+ errPtr->description = "no such key in metadata";
+ errPtr->free = NULL;
+ break;
+ case SQLITE_BUSY:
+ continue;
+ default:
+ reg_sqlite_error(reg->db, errPtr, query);
+ break;
+ }
+ } while (r == SQLITE_BUSY);
+ } else {
+ reg_sqlite_error(reg->db, errPtr, query);
+ }
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
+ return result;
+}
+
+/**
+ * @param [in] reg registry to set value in
+ * @param [in] key metadata key to set
+ * @param [in] value the desired value for the key
+ * @param [out] errPtr on error, a description of the error that occurred
+ * @return true if success; false if failure
+ */
+int reg_set_metadata(reg_registry* reg, const char* key, const char* value,
+ reg_error* errPtr) {
+ int result = 0;
+ sqlite3_stmt* stmt = NULL;
+ char* query;
+ char *test_value;
+ int get_returnval = reg_get_metadata(reg, key, &test_value, errPtr);
+ if (get_returnval) {
+ free(test_value);
+ query = sqlite3_mprintf("UPDATE registry.metadata SET value = '%q' WHERE key='%q'",
+ value, key);
+ } else if (errPtr->code == REG_NOT_FOUND) {
+ query = sqlite3_mprintf("INSERT INTO registry.metadata (key, value) VALUES ('%q', '%q')",
+ key, value);
+ } else {
+ return get_returnval;
+ }
+ if (sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK) {
+ int r;
+ do {
+ r = sqlite3_step(stmt);
+ switch (r) {
+ case SQLITE_DONE:
+ result = 1;
+ break;
+ case SQLITE_BUSY:
+ break;
+ default:
+ reg_sqlite_error(reg->db, errPtr, query);
+ break;
+ }
+ } while (r == SQLITE_BUSY);
+ } else {
+ reg_sqlite_error(reg->db, errPtr, query);
+ }
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
+ sqlite3_free(query);
+ return result;
+}
+
+/**
+ * @param [in] reg the registry to delete the metadata from
+ * @param [in] key the metadata key to delete
+ * @param [out] errPtr on error, a description of the error that occurred
+ * @return true if success; false if failure
+ */
+int reg_del_metadata(reg_registry* reg, const char* key, reg_error* errPtr) {
+ int result = 1;
+ sqlite3_stmt* stmt = NULL;
+ char* query = "DELETE FROM registry.metadata WHERE key=?";
+ if ((sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
+ && (sqlite3_bind_text(stmt, 1, key, -1, SQLITE_STATIC) == SQLITE_OK)) {
+ int r;
+ do {
+ r = sqlite3_step(stmt);
+ switch (r) {
+ case SQLITE_DONE:
+ if (sqlite3_changes(reg->db) == 0) {
+ reg_throw(errPtr, REG_INVALID, "no such metadata key");
+ result = 0;
+ } else {
+ sqlite3_reset(stmt);
+ }
+ break;
+ case SQLITE_BUSY:
+ break;
+ default:
+ reg_sqlite_error(reg->db, errPtr, query);
+ result = 0;
+ break;
+ }
+ } while (r == SQLITE_BUSY);
+ } else {
+ reg_sqlite_error(reg->db, errPtr, query);
+ result = 0;
+ }
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
+ return result;
+}
Modified: trunk/base/src/cregistry/registry.h
===================================================================
--- trunk/base/src/cregistry/registry.h 2014-02-19 06:01:08 UTC (rev 117189)
+++ trunk/base/src/cregistry/registry.h 2014-02-19 06:24:29 UTC (rev 117190)
@@ -88,4 +88,8 @@
int reg_vacuum(char* db_path);
+int reg_get_metadata(reg_registry* reg, const char* key, char** value, reg_error* errPtr);
+int reg_set_metadata(reg_registry* reg, const char* key, const char* value, reg_error* errPtr);
+int reg_del_metadata(reg_registry* reg, const char* key, reg_error* errPtr);
+
#endif /* _CREG_H */
Modified: trunk/base/src/registry2.0/registry.c
===================================================================
--- trunk/base/src/registry2.0/registry.c 2014-02-19 06:01:08 UTC (rev 117189)
+++ trunk/base/src/registry2.0/registry.c 2014-02-19 06:24:29 UTC (rev 117190)
@@ -320,6 +320,57 @@
}
}
+/*
+ * registry::metadata cmd ?arg ...?
+ *
+ * Commands manipulating metadata in the registry. This can be called `registry::metadata`
+ */
+int metadata_cmd(ClientData clientData UNUSED, Tcl_Interp* interp, int objc,
+ Tcl_Obj* CONST objv[]) {
+ if (objc < 3) {
+ Tcl_WrongNumArgs(interp, 1, objv, "cmd key ?value?");
+ return TCL_ERROR;
+ }
+ reg_registry* reg = registry_for(interp, reg_attached);
+ if (reg == NULL) {
+ return TCL_ERROR;
+ }
+ const char *cmdstring = Tcl_GetString(objv[1]);
+ reg_error error;
+ if (strcmp(cmdstring, "get") == 0) {
+ char *data;
+ if (reg_get_metadata(reg, Tcl_GetString(objv[2]), &data, &error)) {
+ Tcl_Obj* result = Tcl_NewStringObj(data, -1);
+ Tcl_SetObjResult(interp, result);
+ free(data);
+ return TCL_OK;
+ } else if (error.code == REG_NOT_FOUND) {
+ Tcl_Obj* result = Tcl_NewIntObj(-1);
+ Tcl_SetObjResult(interp, result);
+ return TCL_OK;
+ } else {
+ return registry_failed(interp, &error);
+ }
+ } else if (strcmp(cmdstring, "set") == 0) {
+ if (objc < 4) {
+ Tcl_WrongNumArgs(interp, 1, objv, "set key value");
+ return TCL_ERROR;
+ }
+ if (reg_set_metadata(reg, Tcl_GetString(objv[2]), Tcl_GetString(objv[3]), &error)) {
+ return TCL_OK;
+ } else {
+ return registry_failed(interp, &error);
+ }
+ } else if (strcmp(cmdstring, "del") == 0) {
+ if (reg_del_metadata(reg, Tcl_GetString(objv[2]), &error)) {
+ return TCL_OK;
+ } else {
+ return registry_failed(interp, &error);
+ }
+ }
+ return TCL_ERROR;
+}
+
/**
* Initializer for the registry lib.
*
@@ -338,6 +389,7 @@
/* Tcl_CreateObjCommand(interp, "registry::item", item_cmd, NULL, NULL); */
Tcl_CreateObjCommand(interp, "registry::entry", entry_cmd, NULL, NULL);
Tcl_CreateObjCommand(interp, "registry::file", file_cmd, NULL, NULL);
+ Tcl_CreateObjCommand(interp, "registry::metadata", metadata_cmd, NULL, NULL);
if (Tcl_PkgProvide(interp, "registry2", "2.0") != TCL_OK) {
return TCL_ERROR;
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140218/4629c503/attachment.html>
More information about the macports-changes
mailing list