diff options
48 files changed, 65 insertions, 96 deletions
diff --git a/Makefile.am b/Makefile.am index 3550b7d..e486477 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = libbb libopkg tests src +SUBDIRS = libbb libopkg src HOST_CPU=@host_cpu@ BUILD_CPU=@build_cpu@ diff --git a/configure.ac b/configure.ac index 51c17bb..63c7256 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,7 @@ AM_INIT_AUTOMAKE([opkg], [0.99.163]) AM_CONFIG_HEADER(libopkg/config.h) AC_CANONICAL_HOST +AC_GNU_SOURCE for top_builddir in . .. ../.. $ac_auxdir $ac_auxdir/..; do diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am index e3548a7..e816317 100644 --- a/libopkg/Makefile.am +++ b/libopkg/Makefile.am @@ -11,7 +11,6 @@ libopkg_include_HEADERS= \ hash_table.h \ includes.h \ opkg_conf.h \ - opkg.h \ opkg_message.h \ opkg_state.h \ nv_pair.h \ @@ -32,7 +31,7 @@ libopkg_la_LIBADD = $(top_builddir)/libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS) opkg_core_sources = args.c args.h \ user.c user.h -opkg_libcore_sources = args.c args.h libopkg.c libopkg.h opkg.h\ +opkg_libcore_sources = args.c args.h libopkg.c libopkg.h\ user.c user.h opkg_state.c opkg_state.h opkg_cmd_sources = opkg_cmd.c opkg_cmd.h \ opkg_configure.c opkg_configure.h \ diff --git a/libopkg/args.c b/libopkg/args.c index 8f6d4ee..29e8852 100644 --- a/libopkg/args.c +++ b/libopkg/args.c @@ -20,7 +20,7 @@ #include <string.h> #include <unistd.h> -#include "opkg.h" +#include "includes.h" #include "config.h" #include "args.h" diff --git a/libopkg/conffile.c b/libopkg/conffile.c index 5f41cc1..519ba45 100644 --- a/libopkg/conffile.c +++ b/libopkg/conffile.c @@ -18,7 +18,7 @@ #include <string.h> #include <stdlib.h> -#include "opkg.h" +#include "includes.h" #include "opkg_message.h" #include "conffile.h" diff --git a/libopkg/conffile.h b/libopkg/conffile.h index 130d1d8..6166cc6 100644 --- a/libopkg/conffile.h +++ b/libopkg/conffile.h @@ -19,9 +19,10 @@ #define CONFFILE_H #include "nv_pair.h" - typedef struct nv_pair conffile_t; +#include "opkg_conf.h" + int conffile_init(conffile_t *conffile, const char *file_name, const char *md5sum); void conffile_deinit(conffile_t *conffile); int conffile_has_been_modified(struct opkg_conf *conf, conffile_t *conffile); diff --git a/libopkg/conffile_list.c b/libopkg/conffile_list.c index 27d48d5..a857de5 100644 --- a/libopkg/conffile_list.c +++ b/libopkg/conffile_list.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include "conffile_list.h" diff --git a/libopkg/conffile_list.h b/libopkg/conffile_list.h index a5daac9..c1421c1 100644 --- a/libopkg/conffile_list.h +++ b/libopkg/conffile_list.h @@ -18,12 +18,13 @@ #ifndef CONFFILE_LIST_H #define CONFFILE_LIST_H -#include "conffile.h" #include "nv_pair_list.h" typedef struct nv_pair_list_elt conffile_list_elt_t; typedef struct nv_pair_list conffile_list_t; +#include "conffile.h" + int conffile_list_init(conffile_list_t *list); void conffile_list_deinit(conffile_list_t *list); diff --git a/libopkg/file_util.c b/libopkg/file_util.c index 3ab1cc5..6f249a2 100644 --- a/libopkg/file_util.c +++ b/libopkg/file_util.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include <sys/types.h> #include <sys/stat.h> diff --git a/libopkg/includes.h b/libopkg/includes.h index 5a67001..65beb56 100644 --- a/libopkg/includes.h +++ b/libopkg/includes.h @@ -1,6 +1,7 @@ #ifndef INCLUDES_H #define INCLUDES_H +#include <config.h> #include <stdio.h> #if STDC_HEADERS @@ -20,15 +21,7 @@ #endif #if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include <memory.h> -# endif -/* XXX: What's the right way to pick up GNU's strndup declaration? */ -# if __GNUC__ -# define __USE_GNU 1 -# endif # include <string.h> -# undef __USE_GNU #endif #if HAVE_STRINGS_H diff --git a/libopkg/libopkg.c b/libopkg/libopkg.c index 3f5adc3..c57838a 100644 --- a/libopkg/libopkg.c +++ b/libopkg/libopkg.c @@ -15,7 +15,6 @@ General Public License for more details. */ -#include "opkg.h" #include "includes.h" #include "libopkg.h" @@ -24,7 +23,8 @@ #include "opkg_cmd.h" #include "file_util.h" - +#include "opkg_message.h" +#include "opkg_error.h" opkg_status_callback opkg_cb_status = NULL; opkg_list_callback opkg_cb_list = NULL; diff --git a/libopkg/nv_pair.c b/libopkg/nv_pair.c index 75a08e8..3d109bb 100644 --- a/libopkg/nv_pair.c +++ b/libopkg/nv_pair.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include "nv_pair.h" #include "str_util.h" diff --git a/libopkg/nv_pair_list.c b/libopkg/nv_pair_list.c index b925322..49d6225 100644 --- a/libopkg/nv_pair_list.c +++ b/libopkg/nv_pair_list.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include "nv_pair.h" #include "void_list.h" diff --git a/libopkg/opkg.h b/libopkg/opkg.h deleted file mode 100644 index 12a264a..0000000 --- a/libopkg/opkg.h +++ /dev/null @@ -1,33 +0,0 @@ -/* opkg.h - the itsy package management system - - Carl D. Worth - - Copyright (C) 2001 University of Southern California - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2, or (at - your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. -*/ - -#ifndef OPKG_H -#define OPKG_H - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "includes.h" -#include "opkg_conf.h" -#include "opkg_message.h" - -#include "opkg_error.h" -#include "opkg_defines.h" -#include "opkg_state.h" - -#endif diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c index 5aa5dfa..02e6755 100644 --- a/libopkg/opkg_cmd.c +++ b/libopkg/opkg_cmd.c @@ -15,17 +15,10 @@ General Public License for more details. */ -#include <string.h> -#include "opkg.h" -#include <libgen.h> -#include <glob.h> -#include <errno.h> -#include <stdlib.h> -#include <unistd.h> -#include <signal.h> -#include <stdio.h> +#include "includes.h" #include <dirent.h> +#include <glob.h> #include "opkg_conf.h" #include "opkg_cmd.h" @@ -38,6 +31,8 @@ #include "file_util.h" #include "str_util.h" #include "libbb/libbb.h" +#include "opkg_utils.h" +#include "opkg_defines.h" #include <fnmatch.h> diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c index 8cda321..34ca34d 100644 --- a/libopkg/opkg_conf.c +++ b/libopkg/opkg_conf.c @@ -15,9 +15,7 @@ General Public License for more details. */ -#include <glob.h> - -#include "opkg.h" +#include "includes.h" #include "opkg_conf.h" #include "xregex.h" @@ -27,6 +25,9 @@ #include "file_util.h" #include "str_util.h" #include "xsystem.h" +#include <glob.h> +#include "opkg_defines.h" + static int opkg_conf_parse_file(opkg_conf_t *conf, const char *filename, pkg_src_list_t *pkg_src_list, diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h index 98b3fe1..b44a761 100644 --- a/libopkg/opkg_conf.h +++ b/libopkg/opkg_conf.h @@ -21,7 +21,6 @@ typedef struct opkg_conf opkg_conf_t; #include "hash_table.h" -#include "opkg.h" #include "args.h" #include "pkg.h" #include "pkg_hash.h" diff --git a/libopkg/opkg_configure.c b/libopkg/opkg_configure.c index 34a5d6f..87e6161 100644 --- a/libopkg/opkg_configure.c +++ b/libopkg/opkg_configure.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include "sprintf_alloc.h" #include "opkg_configure.h" #include "opkg_state.h" diff --git a/libopkg/opkg_download.c b/libopkg/opkg_download.c index cbf8264..7dc06ef 100644 --- a/libopkg/opkg_download.c +++ b/libopkg/opkg_download.c @@ -22,7 +22,7 @@ #include <gpgme.h> #endif -#include "opkg.h" +#include "includes.h" #include "opkg_download.h" #include "opkg_message.h" #include "opkg_state.h" @@ -31,6 +31,7 @@ #include "xsystem.h" #include "file_util.h" #include "str_util.h" +#include "opkg_defines.h" opkg_download_progress_callback opkg_cb_download_progress = NULL; diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c index 883f559..eae72dc 100644 --- a/libopkg/opkg_install.c +++ b/libopkg/opkg_install.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include <errno.h> #include <dirent.h> #include <glob.h> @@ -35,6 +35,7 @@ typedef void (*sighandler_t)(int); #include "opkg_utils.h" #include "opkg_message.h" #include "opkg_state.h" +#include "opkg_defines.h" #include "sprintf_alloc.h" #include "file_util.h" diff --git a/libopkg/opkg_install.h b/libopkg/opkg_install.h index 8d064ac..e4d0c08 100644 --- a/libopkg/opkg_install.h +++ b/libopkg/opkg_install.h @@ -20,6 +20,7 @@ #include "pkg.h" #include "opkg_conf.h" +#include "opkg_error.h" opkg_error_t opkg_install_by_name(opkg_conf_t *conf, const char *pkg_name); opkg_error_t opkg_install_multi_by_name(opkg_conf_t *conf, const char *pkg_name); diff --git a/libopkg/opkg_message.c b/libopkg/opkg_message.c index c00dd97..a2397c5 100644 --- a/libopkg/opkg_message.c +++ b/libopkg/opkg_message.c @@ -14,7 +14,7 @@ */ -#include "opkg.h" +#include "includes.h" #include "opkg_conf.h" #include "opkg_message.h" diff --git a/libopkg/opkg_message.h b/libopkg/opkg_message.h index e0182dd..eb9c4de 100644 --- a/libopkg/opkg_message.h +++ b/libopkg/opkg_message.h @@ -16,7 +16,6 @@ #ifndef _OPKG_MESSAGE_H_ #define _OPKG_MESSAGE_H_ -#include "opkg.h" #include "opkg_conf.h" typedef enum { diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c index afb8aa7..10f7f44 100644 --- a/libopkg/opkg_remove.c +++ b/libopkg/opkg_remove.c @@ -15,12 +15,14 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include "opkg_message.h" #include <glob.h> #include "opkg_remove.h" +#include "opkg_error.h" +#include "opkg_state.h" #include "file_util.h" #include "sprintf_alloc.h" diff --git a/libopkg/opkg_upgrade.c b/libopkg/opkg_upgrade.c index b0b047f..c8b3f19 100644 --- a/libopkg/opkg_upgrade.c +++ b/libopkg/opkg_upgrade.c @@ -16,7 +16,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include "opkg_install.h" #include "opkg_message.h" diff --git a/libopkg/opkg_upgrade.h b/libopkg/opkg_upgrade.h index 5022df4..2e08c53 100644 --- a/libopkg/opkg_upgrade.h +++ b/libopkg/opkg_upgrade.h @@ -13,6 +13,4 @@ General Public License for more details. */ -#include "opkg.h" - int opkg_upgrade_pkg(opkg_conf_t *conf, pkg_t *old); diff --git a/libopkg/opkg_utils.c b/libopkg/opkg_utils.c index 0b59645..3cbedd8 100644 --- a/libopkg/opkg_utils.c +++ b/libopkg/opkg_utils.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include <errno.h> #include <ctype.h> #include <sys/vfs.h> diff --git a/libopkg/opkg_utils.h b/libopkg/opkg_utils.h index 782d7d6..4d11316 100644 --- a/libopkg/opkg_utils.h +++ b/libopkg/opkg_utils.h @@ -19,6 +19,7 @@ #define OPKG_UTILS_H #include "pkg.h" +#include "opkg_error.h" void push_error_list(struct errlist **errors,char * msg); void reverse_error_list(struct errlist **errors); diff --git a/libopkg/pkg.c b/libopkg/pkg.c index 76bb61d..aa56b66 100644 --- a/libopkg/pkg.c +++ b/libopkg/pkg.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include <ctype.h> #include <string.h> #include <errno.h> diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c index 7ebd04e..63464c0 100644 --- a/libopkg/pkg_depends.c +++ b/libopkg/pkg_depends.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include <errno.h> #include <ctype.h> diff --git a/libopkg/pkg_depends.h b/libopkg/pkg_depends.h index b0066ce..87f2e37 100644 --- a/libopkg/pkg_depends.h +++ b/libopkg/pkg_depends.h @@ -20,6 +20,7 @@ #include "pkg.h" #include "pkg_hash.h" +#include "includes.h" enum depend_type { PREDEPEND, diff --git a/libopkg/pkg_dest.c b/libopkg/pkg_dest.c index f015dd6..e7825ce 100644 --- a/libopkg/pkg_dest.c +++ b/libopkg/pkg_dest.c @@ -15,12 +15,14 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include "pkg_dest.h" #include "file_util.h" #include "str_util.h" #include "sprintf_alloc.h" +#include "opkg_state.h" +#include "opkg_defines.h" int pkg_dest_init(pkg_dest_t *dest, const char *name, const char *root_dir,const char * lists_dir) { diff --git a/libopkg/pkg_dest.h b/libopkg/pkg_dest.h index 33c72da..ab895f1 100644 --- a/libopkg/pkg_dest.h +++ b/libopkg/pkg_dest.h @@ -18,6 +18,8 @@ #ifndef PKG_DEST_H #define PKG_DEST_H +#include "includes.h" + typedef struct pkg_dest pkg_dest_t; struct pkg_dest { diff --git a/libopkg/pkg_dest_list.c b/libopkg/pkg_dest_list.c index 023e58e..75d0f3d 100644 --- a/libopkg/pkg_dest_list.c +++ b/libopkg/pkg_dest_list.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include "pkg_dest.h" #include "void_list.h" diff --git a/libopkg/pkg_extract.c b/libopkg/pkg_extract.c index 78c252b..23356ea 100644 --- a/libopkg/pkg_extract.c +++ b/libopkg/pkg_extract.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include <errno.h> #include "pkg_extract.h" diff --git a/libopkg/pkg_hash.c b/libopkg/pkg_hash.c index 0106e65..26e7748 100644 --- a/libopkg/pkg_hash.c +++ b/libopkg/pkg_hash.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include <errno.h> #include <ctype.h> #include <stdlib.h> diff --git a/libopkg/pkg_hash.h b/libopkg/pkg_hash.h index 7303418..548b1b8 100644 --- a/libopkg/pkg_hash.h +++ b/libopkg/pkg_hash.h @@ -19,6 +19,8 @@ #define PKG_HASH_H #include "pkg.h" +#include "pkg_src.h" +#include "pkg_dest.h" #include "pkg_vec.h" #include "hash_table.h" diff --git a/libopkg/pkg_parse.c b/libopkg/pkg_parse.c index 5b321b5..5acaf56 100644 --- a/libopkg/pkg_parse.c +++ b/libopkg/pkg_parse.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include <errno.h> #include <ctype.h> diff --git a/libopkg/pkg_src.c b/libopkg/pkg_src.c index 0566b7f..f531af0 100644 --- a/libopkg/pkg_src.c +++ b/libopkg/pkg_src.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include "pkg_src.h" #include "str_util.h" diff --git a/libopkg/pkg_src_list.c b/libopkg/pkg_src_list.c index c1e63b4..26881ce 100644 --- a/libopkg/pkg_src_list.c +++ b/libopkg/pkg_src_list.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include "pkg_src_list.h" #include "void_list.h" diff --git a/libopkg/pkg_vec.c b/libopkg/pkg_vec.c index 690b7e6..294571f 100644 --- a/libopkg/pkg_vec.c +++ b/libopkg/pkg_vec.c @@ -15,11 +15,11 @@ General Public License for more details. */ -#include <stdlib.h> +#include "includes.h" #include <fnmatch.h> #include "xregex.h" -#include "opkg.h" #include "pkg.h" +#include "opkg_message.h" pkg_vec_t * pkg_vec_alloc(void) { diff --git a/libopkg/pkg_vec.h b/libopkg/pkg_vec.h index 8941c9b..8ebb6b1 100644 --- a/libopkg/pkg_vec.h +++ b/libopkg/pkg_vec.h @@ -20,20 +20,22 @@ typedef struct pkg pkg_t; typedef struct abstract_pkg abstract_pkg_t; +typedef struct pkg_vec pkg_vec_t; +typedef struct abstract_pkg_vec abstract_pkg_vec_t; + +#include "opkg_conf.h" struct pkg_vec { pkg_t **pkgs; int len; }; -typedef struct pkg_vec pkg_vec_t; struct abstract_pkg_vec { abstract_pkg_t **pkgs; int len; }; -typedef struct abstract_pkg_vec abstract_pkg_vec_t; pkg_vec_t * pkg_vec_alloc(void); diff --git a/libopkg/sprintf_alloc.c b/libopkg/sprintf_alloc.c index 1d53b20..8c66994 100644 --- a/libopkg/sprintf_alloc.c +++ b/libopkg/sprintf_alloc.c @@ -15,7 +15,7 @@ GNU General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include <stdarg.h> #include "sprintf_alloc.h" diff --git a/libopkg/str_list.c b/libopkg/str_list.c index e79bf8d..61697c9 100644 --- a/libopkg/str_list.c +++ b/libopkg/str_list.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include "str_list.h" diff --git a/libopkg/str_util.c b/libopkg/str_util.c index e1f5e68..1bb8883 100644 --- a/libopkg/str_util.c +++ b/libopkg/str_util.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" int str_starts_with(const char *str, const char *prefix) { diff --git a/libopkg/void_list.c b/libopkg/void_list.c index af8e6a3..81a51af 100644 --- a/libopkg/void_list.c +++ b/libopkg/void_list.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include <errno.h> #include "void_list.h" diff --git a/libopkg/xregex.c b/libopkg/xregex.c index 7e50050..0ae54e7 100644 --- a/libopkg/xregex.c +++ b/libopkg/xregex.c @@ -15,7 +15,7 @@ GNU General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include "xregex.h" diff --git a/libopkg/xsystem.c b/libopkg/xsystem.c index 06d6ae4..267f2f9 100644 --- a/libopkg/xsystem.c +++ b/libopkg/xsystem.c @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include <sys/wait.h> #include "xsystem.h" |