[Midnightbsd-cvs] src [7330] trunk/lib/libmport: code cleanup and formatting fixes.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 26 15:04:00 EDT 2015
Revision: 7330
http://svnweb.midnightbsd.org/src/?rev=7330
Author: laffer1
Date: 2015-09-26 15:03:58 -0400 (Sat, 26 Sep 2015)
Log Message:
-----------
code cleanup and formatting fixes.
Modified Paths:
--------------
trunk/lib/libmport/setting.c
trunk/lib/libmport/update_primative.c
trunk/lib/libmport/util.c
Modified: trunk/lib/libmport/setting.c
===================================================================
--- trunk/lib/libmport/setting.c 2015-09-26 19:03:19 UTC (rev 7329)
+++ trunk/lib/libmport/setting.c 2015-09-26 19:03:58 UTC (rev 7330)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD: src/lib/libmport/setting.c,v 1.1 2011/07/24 15:59:08 laffer1 Exp $");
+__MBSDID("$MidnightBSD$");
#include "mport.h"
#include "mport_private.h"
@@ -36,48 +36,48 @@
MPORT_PUBLIC_API char *
mport_setting_get(mportInstance *mport, const char *name) {
- sqlite3_stmt *stmt;
- char *val;
+ sqlite3_stmt *stmt;
+ char *val;
- if (name == NULL)
- return NULL;
+ if (name == NULL)
+ return NULL;
- if (mport_db_prepare(mport->db, &stmt, "SELECT val FROM settings WHERE name=%Q", name) != MPORT_OK)
- return NULL;
+ if (mport_db_prepare(mport->db, &stmt, "SELECT val FROM settings WHERE name=%Q", name) != MPORT_OK)
+ return NULL;
- switch (sqlite3_step(stmt)) {
- case SQLITE_ROW:
- val = strdup(sqlite3_column_text(stmt, 0));
- sqlite3_finalize(stmt);
- break;
- case SQLITE_DONE:
- SET_ERROR(MPORT_ERR_FATAL, "Setting not found.");
- sqlite3_finalize(stmt);
- return NULL;
- break; /* NOT REACHED */
- default:
- SET_ERROR(MPORT_ERR_FATAL, sqlite3_errmsg(mport->db));
- sqlite3_finalize(stmt);
- return NULL;
- }
+ switch (sqlite3_step(stmt)) {
+ case SQLITE_ROW:
+ val = strdup(sqlite3_column_text(stmt, 0));
+ sqlite3_finalize(stmt);
+ break;
+ case SQLITE_DONE:
+ SET_ERROR(MPORT_ERR_FATAL, "Setting not found.");
+ sqlite3_finalize(stmt);
+ return NULL;
+ break; /* NOT REACHED */
+ default:
+ SET_ERROR(MPORT_ERR_FATAL, sqlite3_errmsg(mport->db));
+ sqlite3_finalize(stmt);
+ return NULL;
+ }
- return val;
+ return val;
}
MPORT_PUBLIC_API int
mport_setting_set(mportInstance *mport, const char *name, const char *val) {
- char *tmpval;
-
- tmpval = mport_setting_get(mport, name);
- if (tmpval == NULL) {
- if (mport_db_do(mport->db, "INSERT INTO settings (name, val) VALUES(%Q, %Q)", name, val) != MPORT_OK)
- RETURN_CURRENT_ERROR;
- } else {
- free(tmpval);
- if (mport_db_do(mport->db, "UPDATE settings set val=%Q where name=%Q", val, name) != MPORT_OK)
- RETURN_CURRENT_ERROR;
- }
+ char *tmpval;
- return MPORT_OK;
+ tmpval = mport_setting_get(mport, name);
+ if (tmpval == NULL) {
+ if (mport_db_do(mport->db, "INSERT INTO settings (name, val) VALUES(%Q, %Q)", name, val) != MPORT_OK)
+ RETURN_CURRENT_ERROR;
+ } else {
+ free(tmpval);
+ if (mport_db_do(mport->db, "UPDATE settings set val=%Q where name=%Q", val, name) != MPORT_OK)
+ RETURN_CURRENT_ERROR;
+ }
+
+ return MPORT_OK;
}
Modified: trunk/lib/libmport/update_primative.c
===================================================================
--- trunk/lib/libmport/update_primative.c 2015-09-26 19:03:19 UTC (rev 7329)
+++ trunk/lib/libmport/update_primative.c 2015-09-26 19:03:58 UTC (rev 7330)
@@ -38,81 +38,78 @@
MPORT_PUBLIC_API int
mport_update_primative(mportInstance *mport, const char *filename)
{
- mportBundleRead *bundle;
- mportPackageMeta **pkgs, *pkg;
- int i;
-
- if ((bundle = mport_bundle_read_new()) == NULL)
- RETURN_ERROR(MPORT_ERR_FATAL, "Out of memory.");
-
- if (mport_bundle_read_init(bundle, filename) != MPORT_OK)
- RETURN_CURRENT_ERROR;
+ mportBundleRead *bundle;
+ mportPackageMeta **pkgs, *pkg;
+ int i;
- if (mport_bundle_read_prep_for_install(mport, bundle) != MPORT_OK)
- RETURN_CURRENT_ERROR;
-
- if (mport_pkgmeta_read_stub(mport, &pkgs) != MPORT_OK)
- RETURN_CURRENT_ERROR;
-
- for (i=0; *(pkgs + i) != NULL; i++) {
- pkg = pkgs[i];
+ if ((bundle = mport_bundle_read_new()) == NULL)
+ RETURN_ERROR(MPORT_ERR_FATAL, "Out of memory.");
- if (mport_lock_islocked(pkg) == MPORT_LOCKED) {
- mport_call_msg_cb(mport, "Unable to update %s-%s: pacakge is locked.", pkg->name, pkg->version);
- mport_set_err(MPORT_OK, NULL);
- continue;
+ if (mport_bundle_read_init(bundle, filename) != MPORT_OK)
+ RETURN_CURRENT_ERROR;
+
+ if (mport_bundle_read_prep_for_install(mport, bundle) != MPORT_OK)
+ RETURN_CURRENT_ERROR;
+
+ if (mport_pkgmeta_read_stub(mport, &pkgs) != MPORT_OK)
+ RETURN_CURRENT_ERROR;
+
+ for (i = 0; *(pkgs + i) != NULL; i++) {
+ pkg = pkgs[i];
+
+ if (mport_lock_islocked(pkg) == MPORT_LOCKED) {
+ mport_call_msg_cb(mport, "Unable to update %s-%s: pacakge is locked.", pkg->name, pkg->version);
+ mport_set_err(MPORT_OK, NULL);
+ continue;
+ }
+
+ if (
+ (mport_check_preconditions(mport, pkg, MPORT_PRECHECK_UPGRADEABLE|MPORT_PRECHECK_CONFLICTS|MPORT_PRECHECK_DEPENDS) != MPORT_OK) ||
+ (set_prefix_to_installed(mport, pkg) != MPORT_OK) ||
+ (mport_bundle_read_update_pkg(mport, bundle, pkg) != MPORT_OK)
+ ) {
+ mport_call_msg_cb(mport, "Unable to update %s-%s: %s", pkg->name, pkg->version, mport_err_string());
+ mport_set_err(MPORT_OK, NULL);
+ }
}
- if (
- (mport_check_preconditions(mport, pkg, MPORT_PRECHECK_UPGRADEABLE|MPORT_PRECHECK_CONFLICTS|MPORT_PRECHECK_DEPENDS) != MPORT_OK)
- ||
- (set_prefix_to_installed(mport, pkg) != MPORT_OK)
- ||
- (mport_bundle_read_update_pkg(mport, bundle, pkg) != MPORT_OK)
- )
- {
- mport_call_msg_cb(mport, "Unable to update %s-%s: %s", pkg->name, pkg->version, mport_err_string());
- mport_set_err(MPORT_OK, NULL);
- }
- }
-
- if (mport_bundle_read_finish(mport, bundle) != MPORT_OK)
- RETURN_CURRENT_ERROR;
-
- return MPORT_OK;
+ if (mport_bundle_read_finish(mport, bundle) != MPORT_OK)
+ RETURN_CURRENT_ERROR;
+
+ return MPORT_OK;
}
static int
set_prefix_to_installed(mportInstance *mport, mportPackageMeta *pkg)
{
- sqlite3_stmt *stmt;
- int ret = MPORT_OK;
- const char *prefix;
-
- if (mport_db_prepare(mport->db, &stmt, "SELECT prefix FROM packages WHERE pkg=%Q", pkg->name) != MPORT_OK)
- RETURN_CURRENT_ERROR;
-
- switch (sqlite3_step(stmt)) {
- case SQLITE_ROW:
- prefix = sqlite3_column_text(stmt, 0);
-
- if (strcmp(prefix, pkg->prefix) != 0) {
- free(pkg->prefix);
- if ((pkg->prefix = strdup(prefix)) == NULL) {
- ret = MPORT_ERR_FATAL;
- }
- }
- break;
- case SQLITE_DONE:
- ret = SET_ERRORX(MPORT_ERR_FATAL, "%s not in master db, after passing precondition check!", pkg->name);
- break;
- default:
- ret = SET_ERROR(MPORT_ERR_FATAL, sqlite3_errmsg(mport->db));
- break;
- }
+ sqlite3_stmt *stmt;
+ int ret = MPORT_OK;
+ const char *prefix;
- sqlite3_finalize(stmt);
+ if (mport_db_prepare(mport->db, &stmt, "SELECT prefix FROM packages WHERE pkg=%Q", pkg->name) != MPORT_OK)
+ RETURN_CURRENT_ERROR;
- return ret;
+ switch (sqlite3_step(stmt)) {
+ case SQLITE_ROW:
+ prefix = sqlite3_column_text(stmt, 0);
+
+ if (strcmp(prefix, pkg->prefix) != 0) {
+ free(pkg->prefix);
+ if ((pkg->prefix = strdup(prefix)) == NULL) {
+ ret = MPORT_ERR_FATAL;
+ }
+ }
+ break;
+ case SQLITE_DONE:
+ ret = SET_ERRORX(MPORT_ERR_FATAL, "%s not in master db, after passing precondition check!", pkg->name);
+ break;
+ default:
+ ret = SET_ERROR(MPORT_ERR_FATAL, sqlite3_errmsg(mport->db));
+ break;
+ }
+
+ sqlite3_finalize(stmt);
+
+ return ret;
}
Modified: trunk/lib/libmport/util.c
===================================================================
--- trunk/lib/libmport/util.c 2015-09-26 19:03:19 UTC (rev 7329)
+++ trunk/lib/libmport/util.c 2015-09-26 19:03:58 UTC (rev 7330)
@@ -48,56 +48,59 @@
/* these two aren't really utilities, but there's no better place to put them */
-MPORT_PUBLIC_API mportCreateExtras* mport_createextras_new(void)
+MPORT_PUBLIC_API mportCreateExtras*
+mport_createextras_new(void)
{
- return (mportCreateExtras*)calloc(1, sizeof(mportCreateExtras));
+ return (mportCreateExtras *) calloc(1, sizeof(mportCreateExtras));
}
-MPORT_PUBLIC_API void mport_createextras_free(mportCreateExtras *extra)
+MPORT_PUBLIC_API void
+mport_createextras_free(mportCreateExtras *extra)
{
- int i;
-
- free(extra->pkg_filename);
- extra->pkg_filename = NULL;
- free(extra->sourcedir);
- extra->sourcedir = NULL;
- free(extra->mtree);
- extra->mtree = NULL;
- free(extra->pkginstall);
- extra->pkginstall = NULL;
- free(extra->pkgdeinstall);
- extra->pkgdeinstall = NULL;
- free(extra->pkgmessage);
- extra->pkgmessage = NULL;
+ int i;
- i = 0;
- if (extra->conflicts != NULL) {
- while (extra->conflicts[i] != NULL) {
- free(extra->conflicts[i]);
- extra->conflicts[i] = NULL;
- i++;
+ free(extra->pkg_filename);
+ extra->pkg_filename = NULL;
+ free(extra->sourcedir);
+ extra->sourcedir = NULL;
+ free(extra->mtree);
+ extra->mtree = NULL;
+ free(extra->pkginstall);
+ extra->pkginstall = NULL;
+ free(extra->pkgdeinstall);
+ extra->pkgdeinstall = NULL;
+ free(extra->pkgmessage);
+ extra->pkgmessage = NULL;
+
+ i = 0;
+ if (extra->conflicts != NULL) {
+ while (extra->conflicts[i] != NULL) {
+ free(extra->conflicts[i]);
+ extra->conflicts[i] = NULL;
+ i++;
+ }
}
- }
- free(extra->conflicts);
- extra->conflicts = NULL;
+ free(extra->conflicts);
+ extra->conflicts = NULL;
- i = 0;
- if (extra->depends != NULL) {
- while (extra->depends[i] != NULL) {
- free(extra->depends[i]);
- extra->depends[i] = NULL;
- i++;
+ i = 0;
+ if (extra->depends != NULL) {
+ while (extra->depends[i] != NULL) {
+ free(extra->depends[i]);
+ extra->depends[i] = NULL;
+ i++;
+ }
}
- }
-
- free(extra->depends);
- extra->depends = NULL;
-
- free(extra);
+
+ free(extra->depends);
+ extra->depends = NULL;
+
+ free(extra);
}
-MPORT_PUBLIC_API int mport_verify_hash(const char *filename, const char *hash)
+MPORT_PUBLIC_API int
+mport_verify_hash(const char *filename, const char *hash)
{
char *filehash;
@@ -121,59 +124,62 @@
*/
char * mport_hash_file(const char *filename)
{
- return SHA256_File(filename, NULL);
+ return SHA256_File(filename, NULL);
}
-uid_t mport_get_uid(const char *username)
+uid_t
+mport_get_uid(const char *username)
{
- struct passwd *pw;
+ struct passwd *pw;
- if (username == NULL || *username == '\0')
- return 0; /* root */
+ if (username == NULL || *username == '\0')
+ return 0; /* root */
- pw = getpwnam(username);
- if (pw == NULL)
- return 0; /* if we cant figure it out be safe */
+ pw = getpwnam(username);
+ if (pw == NULL)
+ return 0; /* if we cant figure it out be safe */
- return pw->pw_uid;
+ return pw->pw_uid;
}
-gid_t mport_get_gid(const char *group)
+gid_t
+mport_get_gid(const char *group)
{
- struct group *gr;
+ struct group *gr;
- if (group == NULL || *group == '\0')
- return 0; /* wheel */
+ if (group == NULL || *group == '\0')
+ return 0; /* wheel */
- gr = getgrnam(group);
- if (gr == NULL)
- return 0; /* wheel, could not look up */
+ gr = getgrnam(group);
+ if (gr == NULL)
+ return 0; /* wheel, could not look up */
- return gr->gr_gid;
+ return gr->gr_gid;
}
/* a wrapper around chdir, to work with our error system */
int mport_chdir(mportInstance *mport, const char *dir)
{
- if (mport != NULL) {
- char *finaldir;
-
- asprintf(&finaldir, "%s%s", mport->root, dir);
-
- if (finaldir == NULL)
- RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't building root'ed dir");
-
- if (chdir(finaldir) != 0) {
- RETURN_ERRORX(MPORT_ERR_FATAL, "Couldn't chdir to %s: %s", finaldir, strerror(errno));
+
+ if (mport != NULL) {
+ char *finaldir;
+
+ asprintf(&finaldir, "%s%s", mport->root, dir);
+
+ if (finaldir == NULL)
+ RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't building root'ed dir");
+
+ if (chdir(finaldir) != 0) {
+ RETURN_ERRORX(MPORT_ERR_FATAL, "Couldn't chdir to %s: %s", finaldir, strerror(errno));
+ }
+
+ free(finaldir);
+ } else {
+ if (chdir(dir) != 0)
+ RETURN_ERRORX(MPORT_ERR_FATAL, "Couldn't chdir to %s: %s", dir, strerror(errno));
}
-
- free(finaldir);
- } else {
- if (chdir(dir) != 0)
- RETURN_ERRORX(MPORT_ERR_FATAL, "Couldn't chdir to %s: %s", dir, strerror(errno));
- }
-
- return MPORT_OK;
+
+ return MPORT_OK;
}
@@ -183,7 +189,7 @@
int
mport_rmtree(const char *filename)
{
- return mport_xsystem(NULL, "/bin/rm -r %s", filename);
+ return mport_xsystem(NULL, "/bin/rm -r %s", filename);
}
@@ -193,25 +199,25 @@
int
mport_copy_file(const char *fromname, const char *toname)
{
- char buf[BUFSIZ];
- size_t size;
+ char buf[BUFSIZ];
+ size_t size;
- FILE *fsrc = fopen(fromname, "rb");
- if (fsrc == NULL)
- RETURN_ERRORX(MPORT_ERR_FATAL, "Couldn't open source file for copying %s: %s", fromname, strerror(errno));
+ FILE *fsrc = fopen(fromname, "rb");
+ if (fsrc == NULL)
+ RETURN_ERRORX(MPORT_ERR_FATAL, "Couldn't open source file for copying %s: %s", fromname, strerror(errno));
- FILE *fdest = fopen(toname, "wb");
- if (fdest == NULL)
- RETURN_ERRORX(MPORT_ERR_FATAL, "Couldn't open destination file for copying %s: %s", toname, strerror(errno));
+ FILE *fdest = fopen(toname, "wb");
+ if (fdest == NULL)
+ RETURN_ERRORX(MPORT_ERR_FATAL, "Couldn't open destination file for copying %s: %s", toname, strerror(errno));
- while ((size = fread(buf, 1, BUFSIZ, fsrc)) > 0) {
- fwrite(buf, 1, size, fdest);
- }
+ while ((size = fread(buf, 1, BUFSIZ, fsrc)) > 0) {
+ fwrite(buf, 1, size, fdest);
+ }
- fclose(fsrc);
- fclose(fdest);
+ fclose(fsrc);
+ fclose(fdest);
- return MPORT_OK;
+ return MPORT_OK;
}
@@ -222,12 +228,12 @@
*/
int mport_mkdir(const char *dir)
{
- if (mkdir(dir, S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) != 0) {
- if (errno != EEXIST)
- RETURN_ERRORX(MPORT_ERR_FATAL, "Couldn't mkdir %s: %s", dir, strerror(errno));
- }
-
- return MPORT_OK;
+ if (mkdir(dir, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) != 0) {
+ if (errno != EEXIST)
+ RETURN_ERRORX(MPORT_ERR_FATAL, "Couldn't mkdir %s: %s", dir, strerror(errno));
+ }
+
+ return MPORT_OK;
}
@@ -240,15 +246,15 @@
*/
int mport_rmdir(const char *dir, int ignore_nonempty)
{
- if (rmdir(dir) != 0) {
- if (ignore_nonempty && (errno == ENOTEMPTY || errno == ENOENT)) {
- return MPORT_OK;
- } else {
- RETURN_ERRORX(MPORT_ERR_FATAL, "Couldn't rmdir %s: %s", dir, strerror(errno));
+ if (rmdir(dir) != 0) {
+ if (ignore_nonempty && (errno == ENOTEMPTY || errno == ENOENT)) {
+ return MPORT_OK;
+ } else {
+ RETURN_ERRORX(MPORT_ERR_FATAL, "Couldn't rmdir %s: %s", dir, strerror(errno));
+ }
}
- }
-
- return MPORT_OK;
+
+ return MPORT_OK;
}
@@ -265,10 +271,11 @@
int
mport_shell_unregister(const char *shell_file)
{
- if (shell_file == NULL)
- RETURN_ERROR(MPORT_ERR_FATAL, "Shell to unregister is invalid.");
+ if (shell_file == NULL)
+ RETURN_ERROR(MPORT_ERR_FATAL, "Shell to unregister is invalid.");
- return mport_xsystem(NULL, "grep -v %s /etc/shells > /etc/shells.bak && mv /etc/shells.bak /etc/shells", shell_file);
+ return mport_xsystem(NULL, "grep -v %s /etc/shells > /etc/shells.bak && mv /etc/shells.bak /etc/shells",
+ shell_file);
}
@@ -278,9 +285,9 @@
MPORT_PUBLIC_API int
mport_file_exists(const char *file)
{
- struct stat st;
-
- return (lstat(file, &st) == 0);
+ struct stat st;
+
+ return (lstat(file, &st) == 0);
}
@@ -295,46 +302,46 @@
int
mport_xsystem(mportInstance *mport, const char *fmt, ...)
{
- va_list args;
- char *cmnd;
- int ret;
+ va_list args;
+ char *cmnd;
+ int ret;
- va_start(args, fmt);
-
- if (vasprintf(&cmnd, fmt, args) == -1) {
- /* XXX How will the caller know this is no mem, and not a failed exec? */
+ va_start(args, fmt);
+
+ if (vasprintf(&cmnd, fmt, args) == -1) {
+ /* XXX How will the caller know this is no mem, and not a failed exec? */
+ va_end(args);
+ if (cmnd != NULL)
+ free(cmnd);
+ RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't allocate xsystem cmnd string.");
+ }
va_end(args);
- if (cmnd != NULL)
+
+ if (mport != NULL && *(mport->root) != '\0') {
+ char *chroot_cmd;
+ if (asprintf(&chroot_cmd, "%s %s %s", MPORT_CHROOT_BIN, mport->root, cmnd) == -1)
+ RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't allocate xsystem chroot string.");
+
free(cmnd);
- RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't allocate xsystem cmnd string.");
- }
- va_end(args);
-
- if (mport != NULL && *(mport->root) != '\0') {
- char *chroot_cmd;
- if (asprintf(&chroot_cmd, "%s %s %s", MPORT_CHROOT_BIN, mport->root, cmnd) == -1)
- RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't allocate xsystem chroot string.");
-
+ cmnd = chroot_cmd;
+ }
+
+ ret = system(cmnd);
free(cmnd);
- cmnd = chroot_cmd;
- }
-
- ret = system(cmnd);
- free(cmnd);
- /* system(3) ignores SIGINT and SIGQUIT */
- if (WIFSIGNALED(ret) && (WTERMSIG(ret) == SIGINT || WTERMSIG(ret) == SIGQUIT)) {
- RETURN_ERROR(MPORT_ERR_FATAL, "SIGINT or SIGQUIT while running command.");
- }
+ /* system(3) ignores SIGINT and SIGQUIT */
+ if (WIFSIGNALED(ret) && (WTERMSIG(ret) == SIGINT || WTERMSIG(ret) == SIGQUIT)) {
+ RETURN_ERROR(MPORT_ERR_FATAL, "SIGINT or SIGQUIT while running command.");
+ }
- if (ret == 127) {
- RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't execute sh(1)");
- }
+ if (ret == 127) {
+ RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't execute sh(1)");
+ }
- if (WIFEXITED(ret))
- return MPORT_OK;
+ if (WIFEXITED(ret))
+ return MPORT_OK;
- RETURN_ERROR(MPORT_ERR_FATAL, "Error executing command");
+ RETURN_ERROR(MPORT_ERR_FATAL, "Error executing command");
}
@@ -356,43 +363,43 @@
void
mport_parselist(char *opt, char ***list)
{
- size_t len;
- char *input;
- char *field;
+ size_t len;
+ char *input;
+ char *field;
- /* intentionally not freed in here */
- if ((input = strdup(opt)) == NULL) {
- *list = NULL;
- return;
- }
-
- /* first we need to get the length of the depends list */
- for (len = 0; (field = strsep(&opt, " \t\n")) != NULL;) {
- if (*field != '\0')
- len++;
- }
+ /* intentionally not freed in here */
+ if ((input = strdup(opt)) == NULL) {
+ *list = NULL;
+ return;
+ }
- if ((*list = (char **)calloc((len + 1), sizeof(char *))) == NULL) {
- return;
- }
+ /* first we need to get the length of the depends list */
+ for (len = 0; (field = strsep(&opt, " \t\n")) != NULL;) {
+ if (*field != '\0')
+ len++;
+ }
- if (len == 0) {
- **list = NULL;
- return;
- }
+ if ((*list = (char **) calloc((len + 1), sizeof(char *))) == NULL) {
+ return;
+ }
- /* dereference once so we don't loose our minds. */
- char **vec = *list;
-
- while ((field = strsep(&input, " \t\n")) != NULL) {
- if (*field == '\0')
- continue;
+ if (len == 0) {
+ **list = NULL;
+ return;
+ }
- *vec = field;
- vec++;
- }
+ /* dereference once so we don't loose our minds. */
+ char **vec = *list;
- *vec = NULL;
+ while ((field = strsep(&input, " \t\n")) != NULL) {
+ if (*field == '\0')
+ continue;
+
+ *vec = field;
+ vec++;
+ }
+
+ *vec = NULL;
}
/*
@@ -411,74 +418,74 @@
int
mport_run_asset_exec(mportInstance *mport, const char *fmt, const char *cwd, const char *last_file)
{
- size_t l;
- char *cmnd;
- char *pos;
- char *name;
- int ret;
- static int max = 0;
- size_t maxlen = sizeof(max);
+ size_t l;
+ char *cmnd;
+ char *pos;
+ char *name;
+ int ret;
+ static int max = 0;
+ size_t maxlen = sizeof(max);
- if (max == 0) {
- if (sysctlbyname("kern.argmax", &max, &maxlen, NULL, 0) < 0)
- RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't determine maximum argument length");
- }
+ if (max == 0) {
+ if (sysctlbyname("kern.argmax", &max, &maxlen, NULL, 0) < 0)
+ RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't determine maximum argument length");
+ }
- if ((cmnd = malloc(max * sizeof(char))) == NULL)
- RETURN_ERROR(MPORT_ERR_FATAL, "Out of memory");
- pos = cmnd;
+ if ((cmnd = malloc(max * sizeof(char))) == NULL)
+ RETURN_ERROR(MPORT_ERR_FATAL, "Out of memory");
+ pos = cmnd;
- while (*fmt && max > 0) {
- if (*fmt == '%') {
- fmt++;
- switch (*fmt) {
- case 'F':
- /* last_file is absolute, so we skip the cwd at the begining */
- (void)strlcpy(pos, last_file + strlen(cwd) + 1, max);
- l = strlen(last_file + strlen(cwd) + 1);
- pos += l;
- max -= l;
- break;
- case 'D':
- (void)strlcpy(pos, cwd, max);
- l = strlen(cwd);
- pos += l;
- max -= l;
- break;
- case 'B':
- name = dirname(last_file);
- (void)strlcpy(pos, name, max);
- l = strlen(name);
- pos += l;
- max -= l;
- break;
- case 'f':
- name = basename(last_file);
- (void)strlcpy(pos, name, max);
- l = strlen(name);
- pos += l;
- max -= l;
- break;
- default:
- *pos = *fmt;
- max--;
- pos++;
- }
- fmt++;
- } else {
- *pos = *fmt;
- pos++;
- fmt++;
- max--;
+ while (*fmt && max > 0) {
+ if (*fmt == '%') {
+ fmt++;
+ switch (*fmt) {
+ case 'F':
+ /* last_file is absolute, so we skip the cwd at the begining */
+ (void) strlcpy(pos, last_file + strlen(cwd) + 1, max);
+ l = strlen(last_file + strlen(cwd) + 1);
+ pos += l;
+ max -= l;
+ break;
+ case 'D':
+ (void) strlcpy(pos, cwd, max);
+ l = strlen(cwd);
+ pos += l;
+ max -= l;
+ break;
+ case 'B':
+ name = dirname(last_file);
+ (void) strlcpy(pos, name, max);
+ l = strlen(name);
+ pos += l;
+ max -= l;
+ break;
+ case 'f':
+ name = basename(last_file);
+ (void) strlcpy(pos, name, max);
+ l = strlen(name);
+ pos += l;
+ max -= l;
+ break;
+ default:
+ *pos = *fmt;
+ max--;
+ pos++;
+ }
+ fmt++;
+ } else {
+ *pos = *fmt;
+ pos++;
+ fmt++;
+ max--;
+ }
}
- }
-
- *pos = '\0';
- /* cmnd now hold the expanded command, now execute it*/
- ret = mport_xsystem(mport, cmnd);
- free(cmnd);
- return ret;
+ *pos = '\0';
+
+ /* cmnd now hold the expanded command, now execute it*/
+ ret = mport_xsystem(mport, cmnd);
+ free(cmnd);
+ return ret;
}
@@ -486,23 +493,24 @@
*
* free a null padded list of pointers, freeing each pointer as well.
*/
-void mport_free_vec(void *vec)
+void
+mport_free_vec(void *vec)
{
- char *p;
+ char *p;
- if (vec == NULL)
- return;
+ if (vec == NULL)
+ return;
- p = (char *)*(char **)vec;
-
- while (p != NULL) {
- free(p);
- p = NULL;
- p++;
- }
-
- free(vec);
- vec = NULL;
+ p = (char *) *(char **) vec;
+
+ while (p != NULL) {
+ free(p);
+ p = NULL;
+ p++;
+ }
+
+ free(vec);
+ vec = NULL;
}
/* mport_decompress_bzip2(char * input, char * output)
@@ -512,82 +520,82 @@
int
mport_decompress_bzip2(const char *input, const char *output)
{
- FILE *f;
- FILE *fout;
- BZFILE *b;
- int nBuf;
- char buf[4096];
- int bzerror;
+ FILE *f;
+ FILE *fout;
+ BZFILE *b;
+ int nBuf;
+ char buf[4096];
+ int bzerror;
- f = fopen(input, "r");
- if (!f) {
- RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't open bzip2 file for reading");
- }
+ f = fopen(input, "r");
+ if (!f) {
+ RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't open bzip2 file for reading");
+ }
- fout = fopen(output, "w");
- if (!fout) {
- fclose(f);
- RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't open file for writing");
- }
+ fout = fopen(output, "w");
+ if (!fout) {
+ fclose(f);
+ RETURN_ERROR(MPORT_ERR_FATAL, "Couldn't open file for writing");
+ }
- b = BZ2_bzReadOpen(&bzerror, f, 0, 0, NULL, 0);
- if (bzerror != BZ_OK) {
- BZ2_bzReadClose(&bzerror, b);
- RETURN_ERROR(MPORT_ERR_FATAL, "Input error reading bzip2 file");
- }
+ b = BZ2_bzReadOpen(&bzerror, f, 0, 0, NULL, 0);
+ if (bzerror != BZ_OK) {
+ BZ2_bzReadClose(&bzerror, b);
+ RETURN_ERROR(MPORT_ERR_FATAL, "Input error reading bzip2 file");
+ }
- bzerror = BZ_OK;
- while (bzerror == BZ_OK) {
- nBuf = BZ2_bzRead(&bzerror, b, buf, 4096);
- if (bzerror == BZ_OK || bzerror == BZ_STREAM_END) {
- if (fwrite(buf, nBuf, 1, fout) < 1) {
- fclose(fout);
- RETURN_ERROR(MPORT_ERR_FATAL, "Error writing decompressed file");
- }
+ bzerror = BZ_OK;
+ while (bzerror == BZ_OK) {
+ nBuf = BZ2_bzRead(&bzerror, b, buf, 4096);
+ if (bzerror == BZ_OK || bzerror == BZ_STREAM_END) {
+ if (fwrite(buf, nBuf, 1, fout) < 1) {
+ fclose(fout);
+ RETURN_ERROR(MPORT_ERR_FATAL, "Error writing decompressed file");
+ }
+ }
}
- }
- if (bzerror != BZ_STREAM_END) {
- BZ2_bzReadClose(&bzerror, b);
- RETURN_ERROR(MPORT_ERR_FATAL, "Unknown error decompressing bzip2 file");
- } else {
- BZ2_bzReadClose(&bzerror, b);
- }
+ if (bzerror != BZ_STREAM_END) {
+ BZ2_bzReadClose(&bzerror, b);
+ RETURN_ERROR(MPORT_ERR_FATAL, "Unknown error decompressing bzip2 file");
+ } else {
+ BZ2_bzReadClose(&bzerror, b);
+ }
- fclose(f);
- fclose(fout);
+ fclose(f);
+ fclose(fout);
- return MPORT_OK;
+ return MPORT_OK;
}
MPORT_PUBLIC_API char *
mport_get_osrelease(void)
{
- char osrelease[128];
- size_t len;
- char *version;
+ char osrelease[128];
+ size_t len;
+ char *version;
- len = sizeof(osrelease);
- if (sysctlbyname("kern.osrelease", &osrelease, &len, NULL, 0) < 0)
- return NULL;
+ len = sizeof(osrelease);
+ if (sysctlbyname("kern.osrelease", &osrelease, &len, NULL, 0) < 0)
+ return NULL;
- if (osrelease == NULL)
- return NULL;
+ if (osrelease == NULL)
+ return NULL;
- version = calloc(10, sizeof(char));
- if (version == NULL)
- return NULL;
+ version = calloc(10, sizeof(char));
+ if (version == NULL)
+ return NULL;
- for (int i = 0; i < 10; i++) {
- if (osrelease[i] == '\0' || osrelease[i] == '-')
- break;
+ for (int i = 0; i < 10; i++) {
+ if (osrelease[i] == '\0' || osrelease[i] == '-')
+ break;
- version[i] = osrelease[i];
- }
+ version[i] = osrelease[i];
+ }
- version[3] = '\0'; /* force major version only for now */
+ version[3] = '\0'; /* force major version only for now */
- return version;
+ return version;
}
@@ -594,11 +602,11 @@
MPORT_PUBLIC_API char *
mport_version(void)
{
- char *version;
- char *osrel = mport_get_osrelease();
- asprintf(&version, "mport for MidnightBSD %s, Bundle Version %s\n",
- osrel, MPORT_BUNDLE_VERSION_STR);
- free(osrel);
+ char *version;
+ char *osrel = mport_get_osrelease();
+ asprintf(&version, "mport for MidnightBSD %s, Bundle Version %s\n",
+ osrel, MPORT_BUNDLE_VERSION_STR);
+ free(osrel);
- return version;
+ return version;
}
More information about the Midnightbsd-cvs
mailing list