--- Begin Message ---
Author: thomas
Date: 2008-04-14 13:29:40 +0200 (Mon, 14 Apr 2008)
New Revision: 4355
Removed:
trunk/src/target/opkg/libopkg/opkg.h
Modified:
trunk/src/target/opkg/Makefile.am
trunk/src/target/opkg/configure.ac
trunk/src/target/opkg/libopkg/Makefile.am
trunk/src/target/opkg/libopkg/args.c
trunk/src/target/opkg/libopkg/conffile.c
trunk/src/target/opkg/libopkg/conffile.h
trunk/src/target/opkg/libopkg/conffile_list.c
trunk/src/target/opkg/libopkg/conffile_list.h
trunk/src/target/opkg/libopkg/file_util.c
trunk/src/target/opkg/libopkg/includes.h
trunk/src/target/opkg/libopkg/libopkg.c
trunk/src/target/opkg/libopkg/nv_pair.c
trunk/src/target/opkg/libopkg/nv_pair_list.c
trunk/src/target/opkg/libopkg/opkg_cmd.c
trunk/src/target/opkg/libopkg/opkg_conf.c
trunk/src/target/opkg/libopkg/opkg_conf.h
trunk/src/target/opkg/libopkg/opkg_configure.c
trunk/src/target/opkg/libopkg/opkg_download.c
trunk/src/target/opkg/libopkg/opkg_install.c
trunk/src/target/opkg/libopkg/opkg_install.h
trunk/src/target/opkg/libopkg/opkg_message.c
trunk/src/target/opkg/libopkg/opkg_message.h
trunk/src/target/opkg/libopkg/opkg_remove.c
trunk/src/target/opkg/libopkg/opkg_upgrade.c
trunk/src/target/opkg/libopkg/opkg_upgrade.h
trunk/src/target/opkg/libopkg/opkg_utils.c
trunk/src/target/opkg/libopkg/opkg_utils.h
trunk/src/target/opkg/libopkg/pkg.c
trunk/src/target/opkg/libopkg/pkg_depends.c
trunk/src/target/opkg/libopkg/pkg_depends.h
trunk/src/target/opkg/libopkg/pkg_dest.c
trunk/src/target/opkg/libopkg/pkg_dest.h
trunk/src/target/opkg/libopkg/pkg_dest_list.c
trunk/src/target/opkg/libopkg/pkg_extract.c
trunk/src/target/opkg/libopkg/pkg_hash.c
trunk/src/target/opkg/libopkg/pkg_hash.h
trunk/src/target/opkg/libopkg/pkg_parse.c
trunk/src/target/opkg/libopkg/pkg_src.c
trunk/src/target/opkg/libopkg/pkg_src_list.c
trunk/src/target/opkg/libopkg/pkg_vec.c
trunk/src/target/opkg/libopkg/pkg_vec.h
trunk/src/target/opkg/libopkg/sprintf_alloc.c
trunk/src/target/opkg/libopkg/str_list.c
trunk/src/target/opkg/libopkg/str_util.c
trunk/src/target/opkg/libopkg/void_list.c
trunk/src/target/opkg/libopkg/xregex.c
trunk/src/target/opkg/libopkg/xsystem.c
Log:
opkg: remove opkg.h in preperation for new API
Modified: trunk/src/target/opkg/Makefile.am
===================================================================
--- trunk/src/target/opkg/Makefile.am 2008-04-14 06:59:13 UTC (rev 4354)
+++ trunk/src/target/opkg/Makefile.am 2008-04-14 11:29:40 UTC (rev 4355)
@@ -1,4 +1,4 @@
-SUBDIRS = libbb libopkg tests src
+SUBDIRS = libbb libopkg src
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
Modified: trunk/src/target/opkg/configure.ac
===================================================================
--- trunk/src/target/opkg/configure.ac 2008-04-14 06:59:13 UTC (rev 4354)
+++ trunk/src/target/opkg/configure.ac 2008-04-14 11:29:40 UTC (rev 4355)
@@ -4,6 +4,7 @@
AM_CONFIG_HEADER(libopkg/config.h)
AC_CANONICAL_HOST
+AC_GNU_SOURCE
for top_builddir in . .. ../.. $ac_auxdir $ac_auxdir/..; do
Modified: trunk/src/target/opkg/libopkg/Makefile.am
===================================================================
--- trunk/src/target/opkg/libopkg/Makefile.am 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/Makefile.am 2008-04-14 11:29:40 UTC (rev
4355)
@@ -11,7 +11,6 @@
hash_table.h \
includes.h \
opkg_conf.h \
- opkg.h \
opkg_message.h \
opkg_state.h \
nv_pair.h \
@@ -32,7 +31,7 @@
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 \
Modified: trunk/src/target/opkg/libopkg/args.c
===================================================================
--- trunk/src/target/opkg/libopkg/args.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/args.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -20,7 +20,7 @@
#include <string.h>
#include <unistd.h>
-#include "opkg.h"
+#include "includes.h"
#include "config.h"
#include "args.h"
Modified: trunk/src/target/opkg/libopkg/conffile.c
===================================================================
--- trunk/src/target/opkg/libopkg/conffile.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/conffile.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -18,7 +18,7 @@
#include <string.h>
#include <stdlib.h>
-#include "opkg.h"
+#include "includes.h"
#include "opkg_message.h"
#include "conffile.h"
Modified: trunk/src/target/opkg/libopkg/conffile.h
===================================================================
--- trunk/src/target/opkg/libopkg/conffile.h 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/conffile.h 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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);
Modified: trunk/src/target/opkg/libopkg/conffile_list.c
===================================================================
--- trunk/src/target/opkg/libopkg/conffile_list.c 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/conffile_list.c 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -15,7 +15,7 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include "conffile_list.h"
Modified: trunk/src/target/opkg/libopkg/conffile_list.h
===================================================================
--- trunk/src/target/opkg/libopkg/conffile_list.h 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/conffile_list.h 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -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);
Modified: trunk/src/target/opkg/libopkg/file_util.c
===================================================================
--- trunk/src/target/opkg/libopkg/file_util.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/file_util.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -15,7 +15,7 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include <sys/types.h>
#include <sys/stat.h>
Modified: trunk/src/target/opkg/libopkg/includes.h
===================================================================
--- trunk/src/target/opkg/libopkg/includes.h 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/includes.h 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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
Modified: trunk/src/target/opkg/libopkg/libopkg.c
===================================================================
--- trunk/src/target/opkg/libopkg/libopkg.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/libopkg.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -15,7 +15,6 @@
General Public License for more details.
*/
-#include "opkg.h"
#include "includes.h"
#include "libopkg.h"
@@ -24,8 +23,9 @@
#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;
Modified: trunk/src/target/opkg/libopkg/nv_pair.c
===================================================================
--- trunk/src/target/opkg/libopkg/nv_pair.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/nv_pair.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -15,7 +15,7 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include "nv_pair.h"
#include "str_util.h"
Modified: trunk/src/target/opkg/libopkg/nv_pair_list.c
===================================================================
--- trunk/src/target/opkg/libopkg/nv_pair_list.c 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/nv_pair_list.c 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -15,7 +15,7 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include "nv_pair.h"
#include "void_list.h"
Deleted: trunk/src/target/opkg/libopkg/opkg.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg.h 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/opkg.h 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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
Modified: trunk/src/target/opkg/libopkg/opkg_cmd.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_cmd.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/opkg_cmd.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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>
Modified: trunk/src/target/opkg/libopkg/opkg_conf.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_conf.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/opkg_conf.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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,7 +25,10 @@
#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,
nv_pair_list_t *tmp_dest_nv_pair_list,
Modified: trunk/src/target/opkg/libopkg/opkg_conf.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_conf.h 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/opkg_conf.h 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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"
Modified: trunk/src/target/opkg/libopkg/opkg_configure.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_configure.c 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/opkg_configure.c 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -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"
Modified: trunk/src/target/opkg/libopkg/opkg_download.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_download.c 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/opkg_download.c 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -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;
Modified: trunk/src/target/opkg/libopkg/opkg_install.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_install.c 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/opkg_install.c 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -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 @@
#include "opkg_utils.h"
#include "opkg_message.h"
#include "opkg_state.h"
+#include "opkg_defines.h"
#include "sprintf_alloc.h"
#include "file_util.h"
Modified: trunk/src/target/opkg/libopkg/opkg_install.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_install.h 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/opkg_install.h 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -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);
Modified: trunk/src/target/opkg/libopkg/opkg_message.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_message.c 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/opkg_message.c 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -14,7 +14,7 @@
*/
-#include "opkg.h"
+#include "includes.h"
#include "opkg_conf.h"
#include "opkg_message.h"
Modified: trunk/src/target/opkg/libopkg/opkg_message.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_message.h 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/opkg_message.h 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -16,7 +16,6 @@
#ifndef _OPKG_MESSAGE_H_
#define _OPKG_MESSAGE_H_
-#include "opkg.h"
#include "opkg_conf.h"
typedef enum {
Modified: trunk/src/target/opkg/libopkg/opkg_remove.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_remove.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/opkg_remove.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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"
Modified: trunk/src/target/opkg/libopkg/opkg_upgrade.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_upgrade.c 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/opkg_upgrade.c 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -16,7 +16,7 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include "opkg_install.h"
#include "opkg_message.h"
Modified: trunk/src/target/opkg/libopkg/opkg_upgrade.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_upgrade.h 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/opkg_upgrade.h 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -13,6 +13,4 @@
General Public License for more details.
*/
-#include "opkg.h"
-
int opkg_upgrade_pkg(opkg_conf_t *conf, pkg_t *old);
Modified: trunk/src/target/opkg/libopkg/opkg_utils.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_utils.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/opkg_utils.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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>
Modified: trunk/src/target/opkg/libopkg/opkg_utils.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_utils.h 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/opkg_utils.h 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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);
Modified: trunk/src/target/opkg/libopkg/pkg.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg.c 2008-04-14 06:59:13 UTC (rev 4354)
+++ trunk/src/target/opkg/libopkg/pkg.c 2008-04-14 11:29:40 UTC (rev 4355)
@@ -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>
Modified: trunk/src/target/opkg/libopkg/pkg_depends.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_depends.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/pkg_depends.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -15,7 +15,7 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include <errno.h>
#include <ctype.h>
Modified: trunk/src/target/opkg/libopkg/pkg_depends.h
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_depends.h 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/pkg_depends.h 2008-04-14 11:29:40 UTC (rev
4355)
@@ -20,6 +20,7 @@
#include "pkg.h"
#include "pkg_hash.h"
+#include "includes.h"
enum depend_type {
PREDEPEND,
Modified: trunk/src/target/opkg/libopkg/pkg_dest.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_dest.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/pkg_dest.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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)
{
Modified: trunk/src/target/opkg/libopkg/pkg_dest.h
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_dest.h 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/pkg_dest.h 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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
{
Modified: trunk/src/target/opkg/libopkg/pkg_dest_list.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_dest_list.c 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/pkg_dest_list.c 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -15,7 +15,7 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include "pkg_dest.h"
#include "void_list.h"
Modified: trunk/src/target/opkg/libopkg/pkg_extract.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_extract.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/pkg_extract.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -15,7 +15,7 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include <errno.h>
#include "pkg_extract.h"
Modified: trunk/src/target/opkg/libopkg/pkg_hash.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_hash.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/pkg_hash.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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>
Modified: trunk/src/target/opkg/libopkg/pkg_hash.h
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_hash.h 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/pkg_hash.h 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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"
Modified: trunk/src/target/opkg/libopkg/pkg_parse.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_parse.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/pkg_parse.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -15,7 +15,7 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include <errno.h>
#include <ctype.h>
Modified: trunk/src/target/opkg/libopkg/pkg_src.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_src.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/pkg_src.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -15,7 +15,7 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include "pkg_src.h"
#include "str_util.h"
Modified: trunk/src/target/opkg/libopkg/pkg_src_list.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_src_list.c 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/pkg_src_list.c 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -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"
Modified: trunk/src/target/opkg/libopkg/pkg_vec.c
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_vec.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/pkg_vec.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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)
{
Modified: trunk/src/target/opkg/libopkg/pkg_vec.h
===================================================================
--- trunk/src/target/opkg/libopkg/pkg_vec.h 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/pkg_vec.h 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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);
Modified: trunk/src/target/opkg/libopkg/sprintf_alloc.c
===================================================================
--- trunk/src/target/opkg/libopkg/sprintf_alloc.c 2008-04-14 06:59:13 UTC
(rev 4354)
+++ trunk/src/target/opkg/libopkg/sprintf_alloc.c 2008-04-14 11:29:40 UTC
(rev 4355)
@@ -15,7 +15,7 @@
GNU General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include <stdarg.h>
#include "sprintf_alloc.h"
Modified: trunk/src/target/opkg/libopkg/str_list.c
===================================================================
--- trunk/src/target/opkg/libopkg/str_list.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/str_list.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -15,7 +15,7 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include "str_list.h"
Modified: trunk/src/target/opkg/libopkg/str_util.c
===================================================================
--- trunk/src/target/opkg/libopkg/str_util.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/str_util.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -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)
{
Modified: trunk/src/target/opkg/libopkg/void_list.c
===================================================================
--- trunk/src/target/opkg/libopkg/void_list.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/void_list.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -15,7 +15,7 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include <errno.h>
#include "void_list.h"
Modified: trunk/src/target/opkg/libopkg/xregex.c
===================================================================
--- trunk/src/target/opkg/libopkg/xregex.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/xregex.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -15,7 +15,7 @@
GNU General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include "xregex.h"
Modified: trunk/src/target/opkg/libopkg/xsystem.c
===================================================================
--- trunk/src/target/opkg/libopkg/xsystem.c 2008-04-14 06:59:13 UTC (rev
4354)
+++ trunk/src/target/opkg/libopkg/xsystem.c 2008-04-14 11:29:40 UTC (rev
4355)
@@ -15,7 +15,7 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include "includes.h"
#include <sys/wait.h>
#include "xsystem.h"
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-14 13:39:35 +0200 (Mon, 14 Apr 2008)
New Revision: 4356
Modified:
trunk/src/target/opkg/libopkg/opkg_download.c
Log:
opkg: Bug fix for Packages file with a Filename: tag with prepended path.
Patch from Alexandros Kostopoulos <akostop inaccessnetworks com>
Modified: trunk/src/target/opkg/libopkg/opkg_download.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_download.c 2008-04-14 11:29:40 UTC
(rev 4355)
+++ trunk/src/target/opkg/libopkg/opkg_download.c 2008-04-14 11:39:35 UTC
(rev 4356)
@@ -178,6 +178,7 @@
int err;
char *url;
char *pkgid;
+ char *stripped_filename;
if (pkg->src == NULL) {
opkg_message(conf,OPKG_ERROR, "ERROR: Package %s (parent %s) is not
available from any configured src.\n",
@@ -195,8 +196,13 @@
"../../foo.ipk". While this is correct, and exactly what we
want to use to construct url above, here we actually need to
use just the filename part, without any directory. */
- sprintf_alloc(&pkg->local_filename, "%s/%s", dir, pkg->filename);
+ stripped_filename = strrchr(pkg->filename, '/');
+ if ( ! stripped_filename )
+ stripped_filename = pkg->filename;
+
+ sprintf_alloc(&pkg->local_filename, "%s/%s", dir, stripped_filename);
+
err = opkg_download(conf, url, pkg->local_filename);
free(url);
--- End Message ---
