jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Split repo commands into the new xbps-repo bin.

Browse source 
- Remove lib/info.c that doesn't belong in the lib and add it into the
  bins.
- Every binary now uses its own directory on bin/.

This is in preparation for future changes for correct behaviour of
the library and binaries.

--HG--
extra : convert_revision : 880d16378bf940c4f5478de0362afe883cd5fd2c
This commit is contained in:
Juan RP 2009-02-05 14:46:09 +01:00
parent 45265e44d5
commit 7740958643
19 changed files with 412 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitignore vendored
View file

@ -4,10 +4,12 @@ destdir/
srcdistdir/
builddir/
packages/
bin/xbps-bin
bin/xbps-cmpver
bin/xbps-digest
bin/xbps-pkgdb
bin/xbps-bin/xbps-bin
bin/xbps-cmpver/xbps-cmpver
bin/xbps-digest/xbps-digest
bin/xbps-repo/xbps-repo
bin/xbps-src/xbps-src
bin/xbps-pkgdb/xbps-pkgdb
*.o
*.so*
*.bak

49
bin/Makefile
View file

@ -1,37 +1,26 @@
include ../vars.mk
EXTRA_CFLAGS = -funroll-all-loops -ftree-loop-linear
LDFLAGS += -L../lib -L$(PREFIX)/lib -lxbps
SUBDIRS = xbps-bin
SUBDIRS += xbps-cmpver
SUBDIRS += xbps-digest
SUBDIRS += xbps-pkgdb
SUBDIRS += xbps-repo
SUBDIRS += xbps-src
BINS = xbps-bin xbps-cmpver xbps-digest xbps-pkgdb
all: $(BINS)
.PHONY: all
all:
for dir in $(SUBDIRS); do \
$(MAKE) -C $$dir; \
done
xbps-bin: xbps-bin.o
$(CC) $(LDFLAGS) $^ -o $@
xbps-cmpver: xbps-cmpver.o
$(CC) $(LDFLAGS) $^ -o $@
xbps-digest: xbps-digest.o
$(CC) $(EXTRA_CFLAGS) $(LDFLAGS) $^ -o $@
xbps-pkgdb: xbps-pkgdb.o
$(CC) $(LDFLAGS) $^ -o $@
.PHONY: install
install:
for dir in $(SUBDIRS); do \
$(MAKE) -C $$dir install; \
done
.PHONY: clean
clean: clean-bins clean-objs
clean-bins:
-rm -f $(BINS)
clean-objs:
-rm -f *.o
install: $(BINS)
install -d $(SBINDIR)
install -m 755 $(BINS) $(SBINDIR)
install -m 755 xbps-src.sh $(SBINDIR)/xbps-src
sed -i -e "s|@@XBPS_INSTALL_PREFIX@@|$(PREFIX)|g" $(SBINDIR)/xbps-src
clean:
for dir in $(SUBDIRS); do \
$(MAKE) -C $$dir clean; \
done

24
bin/xbps-bin/Makefile Normal file
View file

@ -0,0 +1,24 @@
TOPDIR = ../..
include $(TOPDIR)/vars.mk
OBJS = main.o
BIN = xbps-bin
all: $(BIN)
.PHONY: all
$(BIN): $(OBJS)
$(CC) $(LDFLAGS) $^ -o $@
.PHONY: clean
clean: clean-bins clean-objs
clean-bins:
-rm -f $(BIN)
clean-objs:
-rm -f *.o
install: $(BIN)
install -d $(SBINDIR)
install -m 755 $(BIN) $(SBINDIR)

170
bin/xbps-bin/main.c Normal file
View file

@ -0,0 +1,170 @@
/*-
* Copyright (c) 2008-2009 Juan Romero Pardines.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <stdio.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <limits.h>
#include <libgen.h>
#include <unistd.h>
#include <xbps_api.h>
static void usage(void);
static int list_pkgs_in_dict(prop_object_t, void *, bool *);
static void
usage(void)
{
printf("Usage: xbps-bin [options] [action] [arguments]\n\n"
" Available actions:\n"
" install, list, remove, show\n"
" Actions with arguments:\n"
" install\t<pkgname>\n"
" remove\t<pkgname>\n"
" show\t<pkgname>\n"
" Options shared by all actions:\n"
" -r\t\t<rootdir>\n"
"\n"
" Examples:\n"
" $ xbps-bin install klibc\n"
" $ xbps-bin -r /path/to/root install klibc\n"
" $ xbps-bin list\n"
" $ xbps-bin remove klibc\n"
" $ xbps-bin show klibc\n");
exit(EXIT_FAILURE);
}
static int
list_pkgs_in_dict(prop_object_t obj, void *arg, bool *loop_done)
{
const char *pkgname, *version, *short_desc;
assert(prop_object_type(obj) == PROP_TYPE_DICTIONARY);
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(obj, "version", &version);
prop_dictionary_get_cstring_nocopy(obj, "short_desc", &short_desc);
if (pkgname && version && short_desc) {
printf("%s (%s)\t%s\n", pkgname, version, short_desc);
return 0;
}
return EINVAL;
}
int
main(int argc, char **argv)
{
prop_dictionary_t dict;
char *plist, *root = NULL;
int c, rv = 0;
while ((c = getopt(argc, argv, "r:")) != -1) {
switch (c) {
case 'r':
/* To specify the root directory */
root = optarg;
xbps_set_rootdir(root);
break;
case '?':
default:
usage();
}
}
argc -= optind;
argv += optind;
if (argc < 1)
usage();
if (strcasecmp(argv[0], "list") == 0) {
/* Lists packages currently registered in database. */
if (argc != 1)
usage();
plist = xbps_append_full_path(true, NULL, XBPS_REGPKGDB);
if (plist == NULL)
exit(EXIT_FAILURE);
dict = prop_dictionary_internalize_from_file(plist);
if (dict == NULL) {
printf("No packages currently registered.\n");
free(plist);
exit(EXIT_SUCCESS);
}
if (!xbps_callback_array_iter_in_dict(dict, "packages",
list_pkgs_in_dict, NULL)) {
prop_object_release(dict);
free(plist);
exit(EXIT_FAILURE);
}
prop_object_release(dict);
free(plist);
} else if ((strcasecmp(argv[0], "install") == 0) ||
(strcasecmp(argv[0], "remove") == 0)) {
/* Installs a binary package and required deps. */
if (argc != 2)
usage();
if (geteuid() != 0) {
printf("ERROR: root permissions are needed to install"
"and remove binary packages.\n");
exit(EXIT_FAILURE);
}
/* Install into root directory by default. */
if (strcasecmp(argv[0], "install") == 0) {
rv = xbps_install_binary_pkg(argv[1], root);
if (rv) {
printf("ERROR: unable to install %s.\n", argv[1]);
exit(rv);
}
printf("Package %s installed successfully.\n", argv[1]);
} else {
rv = xbps_remove_binary_pkg(argv[1], root);
if (rv) {
if (rv == ENOENT)
printf("Package %s is not installed.\n",
argv[1]);
else
printf("ERROR: unable to remove %s.\n",
argv[1]);
exit(rv);
}
printf("Package %s removed successfully.\n", argv[1]);
}
} else {
usage();
}
exit(EXIT_SUCCESS);
}

24
bin/xbps-cmpver/Makefile Normal file
View file

@ -0,0 +1,24 @@
TOPDIR = ../..
include $(TOPDIR)/vars.mk
OBJS = main.o
BIN = xbps-cmpver
all: $(BIN)
.PHONY: all
$(BIN): $(OBJS)
$(CC) $(LDFLAGS) $^ -o $@
.PHONY: clean
clean: clean-bins clean-objs
clean-bins:
-rm -f $(BIN)
clean-objs:
-rm -f *.o
install: $(BIN)
install -d $(SBINDIR)
install -m 755 $(BIN) $(SBINDIR)

2
bin/xbps-cmpver.c → bin/xbps-cmpver/main.c
View file

@ -1,4 +1,4 @@
/*
/*
* Compare package and version strings
* @ 2008
* Author: pancake <youterm.com>

25
bin/xbps-digest/Makefile Normal file
View file

@ -0,0 +1,25 @@
TOPDIR = ../..
include $(TOPDIR)/vars.mk
EXTRA_CFLAGS = -funroll-all-loops -ftree-loop-linear
OBJS = main.o
BIN = xbps-digest
all: $(BIN)
.PHONY: all
$(BIN): $(OBJS)
$(CC) $(EXTRA_CFLAGS) $(LDFLAGS) $^ -o $@
.PHONY: clean
clean: clean-bins clean-objs
clean-bins:
-rm -f $(BIN)
clean-objs:
-rm -f *.o
install: $(BIN)
install -d $(SBINDIR)
install -m 755 $(BIN) $(SBINDIR)

2
bin/xbps-digest.c → bin/xbps-digest/main.c
View file

@ -58,7 +58,7 @@ main(int argc, char **argv)
for (i = 1; i < argc; i++) {
if ((fd = open(argv[i], O_RDONLY)) == -1) {
printf("xbps-digest: cannot open %s (%s)\n", argv[i],
strerror(errno));
strerror(errno));
exit(EXIT_FAILURE);
}

24
bin/xbps-pkgdb/Makefile Normal file
View file

@ -0,0 +1,24 @@
TOPDIR = ../..
include $(TOPDIR)/vars.mk
OBJS = main.o
BIN = xbps-pkgdb
all: $(BIN)
.PHONY: all
$(BIN): $(OBJS)
$(CC) $(LDFLAGS) $^ -o $@
.PHONY: clean
clean: clean-bins clean-objs
clean-bins:
-rm -f $(BIN)
clean-objs:
-rm -f *.o
install: $(BIN)
install -d $(SBINDIR)
install -m 755 $(BIN) $(SBINDIR)

0
bin/xbps-pkgdb.c → bin/xbps-pkgdb/main.c
View file

24
bin/xbps-repo/Makefile Normal file
View file

@ -0,0 +1,24 @@
TOPDIR = ../..
include $(TOPDIR)/vars.mk
OBJS = util.o main.o
BIN = xbps-repo
all: $(BIN)
.PHONY: all
$(BIN): $(OBJS)
$(CC) $(LDFLAGS) $^ -o $@
.PHONY: clean
clean: clean-bins clean-objs
clean-bins:
-rm -f $(BIN)
clean-objs:
-rm -f *.o
install: $(BIN)
install -d $(SBINDIR)
install -m 755 $(BIN) $(SBINDIR)

95
bin/xbps-bin.c → bin/xbps-repo/main.c
View file

@ -33,6 +33,7 @@
#include <unistd.h>
#include <xbps_api.h>
#include "util.h"
typedef struct repository_info {
const char *index_version;
@ -51,30 +52,24 @@ static char *plist;
static void
usage(void)
{
printf("Usage: xbps-bin [options] [action] [arguments]\n\n"
printf("Usage: xbps-repo [options] [action] [arguments]\n\n"
" Available actions:\n"
" install, list, remove, repo-add, repo-list, repo-rm, search, show\n"
" add, list, remove, search, show\n"
" Actions with arguments:\n"
" install\t<pkgname>\n"
" remove\t<pkgname>\n"
" repo-add\t<URI>\n"
" repo-rm\t<URI>\n"
" add\t<URI>\n"
" remove\t<URI>\n"
" search\t<string>\n"
" show\t<pkgname>\n"
" Options shared by all actions:\n"
" -r\t\t<rootdir>\n"
"\n"
" Examples:\n"
" $ xbps-bin install klibc\n"
" $ xbps-bin -r /path/to/root install klibc\n"
" $ xbps-bin list\n"
" $ xbps-bin remove klibc\n"
" $ xbps-bin repo-add /path/to/directory\n"
" $ xbps-bin repo-add http://www.location.org/xbps-repo\n"
" $ xbps-bin repo-list\n"
" $ xbps-bin repo-rm /path/to/directory\n"
" $ xbps-bin search klibc\n"
" $ xbps-bin show klibc\n");
" $ xbps-repo add /path/to/directory\n"
" $ xbps-repo add http://www.location.org/xbps-repo\n"
" $ xbps-repo list\n"
" $ xbps-repo remove /path/to/directory\n"
" $ xbps-repo search klibc\n"
" $ xbps-repo show klibc\n");
exit(EXIT_FAILURE);
}
@ -175,7 +170,7 @@ main(int argc, char **argv)
prop_dictionary_t dict;
repo_info_t *rinfo = NULL;
char dpkgidx[PATH_MAX], *root = NULL;
int c, rv = 0;
int c;
while ((c = getopt(argc, argv, "r:")) != -1) {
switch (c) {
@ -196,7 +191,7 @@ main(int argc, char **argv)
if (argc < 1)
usage();
if (strcasecmp(argv[0], "repo-add") == 0) {
if (strcasecmp(argv[0], "add") == 0) {
/* Adds a new repository to the pool. */
if (argc != 2)
usage();
@ -249,7 +244,7 @@ main(int argc, char **argv)
free(rinfo);
free(plist);
} else if (strcasecmp(argv[0], "repo-list") == 0) {
} else if (strcasecmp(argv[0], "list") == 0) {
/* Lists all repositories registered in pool. */
if (argc != 1)
usage();
@ -260,7 +255,8 @@ main(int argc, char **argv)
prop_object_release(dict);
free(plist);
} else if (strcasecmp(argv[0], "repo-rm") == 0) {
} else if ((strcasecmp(argv[0], "rm") == 0) ||
(strcasecmp(argv[0], "remove") == 0)) {
/* Remove a repository from the pool. */
if (argc != 2)
usage();
@ -306,65 +302,6 @@ main(int argc, char **argv)
prop_object_release(dict);
free(plist);
} else if (strcasecmp(argv[0], "list") == 0) {
/* Lists packages currently registered in database. */
if (argc != 1)
usage();
plist = xbps_append_full_path(true, NULL, XBPS_REGPKGDB);
if (plist == NULL)
exit(EXIT_FAILURE);
dict = prop_dictionary_internalize_from_file(plist);
if (dict == NULL) {
printf("No packages currently registered.\n");
free(plist);
exit(EXIT_SUCCESS);
}
if (!xbps_callback_array_iter_in_dict(dict, "packages",
xbps_list_pkgs_in_dict, NULL)) {
prop_object_release(dict);
free(plist);
exit(EXIT_FAILURE);
}
prop_object_release(dict);
free(plist);
} else if ((strcasecmp(argv[0], "install") == 0) ||
(strcasecmp(argv[0], "remove") == 0)) {
/* Installs a binary package and required deps. */
if (argc != 2)
usage();
if (geteuid() != 0) {
printf("ERROR: root permissions are needed to install"
"and remove binary packages.\n");
exit(EXIT_FAILURE);
}
/* Install into root directory by default. */
if (strcasecmp(argv[0], "install") == 0) {
rv = xbps_install_binary_pkg(argv[1], root);
if (rv) {
printf("ERROR: unable to install %s.\n", argv[1]);
exit(rv);
}
printf("Package %s installed successfully.\n", argv[1]);
} else {
rv = xbps_remove_binary_pkg(argv[1], root);
if (rv) {
if (rv == ENOENT)
printf("Package %s is not installed.\n",
argv[1]);
else
printf("ERROR: unable to remove %s.\n",
argv[1]);
exit(rv);
}
printf("Package %s removed successfully.\n", argv[1]);
}
} else {
usage();
}

63
lib/info.c → bin/xbps-repo/util.c
View file

@ -32,9 +32,14 @@
#include <prop/proplib.h>
#include <xbps_api.h>
#include "util.h"
void
xbps_show_pkg_info(prop_dictionary_t dict)
static void show_pkg_info(prop_dictionary_t);
static int show_pkg_namedesc(prop_object_t, void *, bool *);
static int list_strings_in_array2(prop_object_t, void *, bool *);
static void
show_pkg_info(prop_dictionary_t dict)
{
prop_object_t obj;
const char *sep = NULL;
@ -86,7 +91,7 @@ xbps_show_pkg_info(prop_dictionary_t dict)
printf("Dependencies:\n\t");
sep = " ";
xbps_callback_array_iter_in_dict(dict, "run_depends",
xbps_list_strings_in_array2, (void *)sep);
list_strings_in_array2, (void *)sep);
printf("\n\n");
}
@ -94,7 +99,7 @@ xbps_show_pkg_info(prop_dictionary_t dict)
if (obj && prop_object_type(obj) == PROP_TYPE_ARRAY) {
printf("Configuration files:\n\t");
xbps_callback_array_iter_in_dict(dict, "conf_files",
xbps_list_strings_in_array2, NULL);
list_strings_in_array2, NULL);
printf("\n");
}
@ -102,7 +107,7 @@ xbps_show_pkg_info(prop_dictionary_t dict)
if (obj && prop_object_type(obj) == PROP_TYPE_ARRAY) {
printf("Permanent directories:\n\t");
xbps_callback_array_iter_in_dict(dict, "keep_dirs",
xbps_list_strings_in_array2, NULL);
list_strings_in_array2, NULL);
printf("\n");
}
@ -115,25 +120,6 @@ xbps_show_pkg_info(prop_dictionary_t dict)
printf(" %s\n", prop_string_cstring_nocopy(obj));
}
int
xbps_show_pkg_namedesc(prop_object_t obj, void *arg, bool *loop_done)
{
const char *pkgname, *desc, *ver, *string = arg;
assert(prop_object_type(obj) == PROP_TYPE_DICTIONARY);
assert(string != NULL);
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(obj, "short_desc", &desc);
prop_dictionary_get_cstring_nocopy(obj, "version", &ver);
assert(ver != NULL);
if ((strstr(pkgname, string) || strstr(desc, string)))
printf(" %s-%s - %s\n", pkgname, ver, desc);
return 0;
}
int
xbps_search_string_in_pkgs(prop_object_t obj, void *arg, bool *loop_done)
{
@ -159,7 +145,7 @@ xbps_search_string_in_pkgs(prop_object_t obj, void *arg, bool *loop_done)
printf("From %s repository ...\n", repofile);
xbps_callback_array_iter_in_dict(dict, "packages",
xbps_show_pkg_namedesc, arg);
show_pkg_namedesc, arg);
prop_object_release(dict);
free(plist);
@ -210,7 +196,7 @@ xbps_show_pkg_info_from_repolist(prop_object_t obj, void *arg, bool *loop_done)
}
printf("Repository: %s\n", repoloc);
xbps_show_pkg_info(pkgdict);
show_pkg_info(pkgdict);
*loop_done = true;
prop_object_release(dict);
free(plist);
@ -218,26 +204,27 @@ xbps_show_pkg_info_from_repolist(prop_object_t obj, void *arg, bool *loop_done)
return 0;
}
int
xbps_list_pkgs_in_dict(prop_object_t obj, void *arg, bool *loop_done)
static int
show_pkg_namedesc(prop_object_t obj, void *arg, bool *loop_done)
{
const char *pkgname, *version, *short_desc;
const char *pkgname, *desc, *ver, *string = arg;
assert(prop_object_type(obj) == PROP_TYPE_DICTIONARY);
assert(string != NULL);
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(obj, "version", &version);
prop_dictionary_get_cstring_nocopy(obj, "short_desc", &short_desc);
if (pkgname && version && short_desc) {
printf("%s (%s)\t%s\n", pkgname, version, short_desc);
return 0;
}
prop_dictionary_get_cstring_nocopy(obj, "short_desc", &desc);
prop_dictionary_get_cstring_nocopy(obj, "version", &ver);
assert(ver != NULL);
return EINVAL;
if ((strstr(pkgname, string) || strstr(desc, string)))
printf(" %s-%s - %s\n", pkgname, ver, desc);
return 0;
}
int
xbps_list_strings_in_array2(prop_object_t obj, void *arg, bool *loop_done)
static int
list_strings_in_array2(prop_object_t obj, void *arg, bool *loop_done)
{
static uint16_t count;
const char *sep;

28
bin/xbps-repo/util.h Normal file
View file

@ -0,0 +1,28 @@
/*-
* Copyright (c) 2008 Juan Romero Pardines.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
int xbps_search_string_in_pkgs(prop_object_t, void *, bool *);
int xbps_show_pkg_info_from_repolist(prop_object_t, void *, bool *);
int xbps_list_strings_in_array(prop_object_t, void *, bool *);

18
bin/xbps-src/Makefile Normal file
View file

@ -0,0 +1,18 @@
TOPDIR = ../..
include $(TOPDIR)/vars.mk
BIN = xbps-src
.PHONY: all
all:
sed -e "s|@@XBPS_INSTALL_PREFIX@@|$(PREFIX)|g" main.sh > xbps-src
.PHONY: clean
clean: clean-bins
clean-bins:
-rm -f $(BIN)
install: $(BIN)
install -d $(SBINDIR)
install -m 755 $(BIN) $(SBINDIR)

0
bin/xbps-src.sh → bin/xbps-src/main.sh
View file

47
include/plist.h
View file

@ -26,30 +26,8 @@
#ifndef _XBPS_PLIST_H_
#define _XBPS_PLIST_H_
/*
* Adds an opaque object with specified key into a dictionary.
*
* Arguments:
* - prop_dictionary_t: dictionary to store the object.
* - prop_object_t: the object to be stored.
* - const char *: the key associated with the object.
*
* Returns true on success, false on failure.
*/
bool
xbps_add_obj_to_dict(prop_dictionary_t, prop_object_t, const char *);
/*
* Adds an opaque object into an array.
*
* Arguments:
* - prop_array_t: the array storing the object.
* - prop_object_t: the opaque object to be stored.
*
* Returns true on success, false on failure.
*/
bool
xbps_add_obj_to_array(prop_array_t, prop_object_t);
bool xbps_add_obj_to_dict(prop_dictionary_t, prop_object_t, const char *);
bool xbps_add_obj_to_array(prop_array_t, prop_object_t);
/*
* Executes a function callback to process all objects that are
@ -131,27 +109,8 @@ bool xbps_unregister_repository(const char *);
bool
xbps_remove_pkg_dict_from_file(const char *, const char *);
/*
* Shows information of a package by looking at its dictionary.
* All known objects on it will be showed up.
*
* Arguments:
* - prop_dictionary_t: the package dictionary.
*/
void xbps_show_pkg_info(prop_dictionary_t);
/*
* Internal functions.
*/
int xbps_list_pkgs_in_dict(prop_object_t, void *, bool *);
int xbps_list_strings_in_array(prop_object_t, void *, bool *);
int xbps_list_strings_in_array2(prop_object_t, void *, bool *);
int xbps_remove_string_from_array(prop_object_t, void *, bool *);
int xbps_show_pkg_info_from_repolist(prop_object_t obj, void *, bool *);
int xbps_show_pkg_namedesc(prop_object_t, void *, bool *);
int xbps_search_string_in_pkgs(prop_object_t, void *, bool *);
/* Utils */
int xbps_remove_string_from_array(prop_object_t, void *, bool *);
void xbps_set_rootdir(const char *);
char * xbps_append_full_path(bool, const char *, const char *);
int xbps_check_is_installed_pkg(const char *);

2
lib/Makefile
View file

@ -9,7 +9,7 @@ LIBXBPS = libxbps.so
LIBXBPS_LDFLAGS = -larchive -lprop -shared -Wl,-soname,$(LIBXBPS).$(MAJOR)
OBJECTS = cmpver.o depends.o humanize_number.o install.o plist.o
OBJECTS += sha256.o util.o repository.o fexec.o info.o remove.o
OBJECTS += sha256.o util.o repository.o fexec.o remove.o
all: $(LIBXBPS)
.PHONY: all

4
vars.mk
View file

@ -3,7 +3,9 @@
PREFIX ?= /usr/local
SBINDIR ?= $(PREFIX)/sbin
LIBDIR ?= $(PREFIX)/lib
TOPDIR ?= ..
CPPFLAGS += -I../include
LDFLAGS += -L$(TOPDIR)/lib -L$(PREFIX)/lib -lxbps
CPPFLAGS += -I$(TOPDIR)/include
CFLAGS += -Wstack-protector -fstack-protector-all
CFLAGS += -O2 -Wall -Werror -fPIC -DPIC