From: graham.gower Date: Fri, 18 Dec 2009 00:46:30 +0000 (+0000) Subject: Move libopkg.c out into the src dir. It shouldn't be part of the library. X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=23f45a934e9315c8f6f235f614e376771b737621;p=project%2Fopkg-lede.git Move libopkg.c out into the src dir. It shouldn't be part of the library. git-svn-id: http://opkg.googlecode.com/svn/trunk@499 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358 --- diff --git a/configure.ac b/configure.ac index 1dbd369..e7c7831 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,12 @@ # Process this file with autoconf to produce a configure script -AC_INIT(libopkg/libopkg.c) +AC_INIT([opkg], [0.1.7]) +AC_CONFIG_SRCDIR([libopkg/pkg.c]) AC_CONFIG_AUX_DIR([conf]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([shave]) -AM_INIT_AUTOMAKE([opkg], [0.1.7]) +AM_INIT_AUTOMAKE AM_CONFIG_HEADER(libopkg/config.h) AC_CANONICAL_HOST diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am index 9e6608b..a55d0b7 100644 --- a/libopkg/Makefile.am +++ b/libopkg/Makefile.am @@ -5,7 +5,7 @@ libopkg_includedir=$(includedir)/libopkg libopkg_include_HEADERS= *.h -opkg_libcore_sources = args.c args.h libopkg.c libopkg.h\ +opkg_libcore_sources = args.c args.h \ includes.h \ opkg.c opkg.h \ opkg_defines.h diff --git a/libopkg/libopkg.c b/libopkg/libopkg.c deleted file mode 100644 index d86be9e..0000000 --- a/libopkg/libopkg.c +++ /dev/null @@ -1,117 +0,0 @@ -/* opkglib.c - the opkg package management system - - Florian Boor - - Copyright (C) 2003 kernel concepts - - 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. -*/ - -#include "includes.h" - -#include "opkg_conf.h" -#include "opkg_cmd.h" -#include "file_util.h" -#include "args.h" -#include "opkg_download.h" - -#include "opkg_message.h" - -/* This is used for backwards compatibility */ -int -opkg_op (int argc, char *argv[]) -{ - int opts; - char *cmd_name; - opkg_cmd_t *cmd; - int nocheckfordirorfile = 0; - int noreadfeedsfile = 0; - - conf->verbosity = NOTICE; - - opts = args_parse (argc, argv); - if (opts == argc || opts < 0) - { - args_usage ("opkg must have one sub-command argument"); - } - - cmd_name = argv[opts++]; - - if ( !strcmp(cmd_name,"print-architecture") || - !strcmp(cmd_name,"print_architecture") || - !strcmp(cmd_name,"print-installation-architecture") || - !strcmp(cmd_name,"print_installation_architecture") ) - nocheckfordirorfile = 1; - - if ( !strcmp(cmd_name,"flag") || - !strcmp(cmd_name,"configure") || - !strcmp(cmd_name,"remove") || - !strcmp(cmd_name,"files") || - !strcmp(cmd_name,"search") || - !strcmp(cmd_name,"compare_versions") || - !strcmp(cmd_name,"compare-versions") || - !strcmp(cmd_name,"list_installed") || - !strcmp(cmd_name,"list-installed") || - !strcmp(cmd_name,"status") ) - noreadfeedsfile = 1; - - cmd = opkg_cmd_find (cmd_name); - if (cmd == NULL) - { - fprintf (stderr, "%s: unknown sub-command %s\n", argv[0], - cmd_name); - args_usage (NULL); - } - - conf->pfm = cmd->pfm; - - if (opkg_conf_init()) - goto err0; - - if (!nocheckfordirorfile) { - if (!noreadfeedsfile) { - if (pkg_hash_load_feeds()) - goto err1; - } - - if (pkg_hash_load_status_files()) - goto err1; - } - - if (cmd->requires_args && opts == argc) - { - fprintf (stderr, - "%s: the ``%s'' command requires at least one argument\n", - argv[0], cmd_name); - args_usage (NULL); - } - - if (opkg_cmd_exec (cmd, argc - opts, (const char **) (argv + opts))) - goto err2; - - print_error_list(); - free_error_list(); - - return 0; - -err2: -#ifdef HAVE_CURL - opkg_curl_cleanup(); -#endif -err1: - opkg_conf_deinit (); - -err0: - print_error_list(); - free_error_list(); - - return -1; -} diff --git a/libopkg/libopkg.h b/libopkg/libopkg.h deleted file mode 100644 index 01ce6f0..0000000 --- a/libopkg/libopkg.h +++ /dev/null @@ -1,34 +0,0 @@ -/* opkglib.h - the opkg package management system - - Florian Boor - - 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 OPKGLIB_H -#define OPKGLIB_H - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - - -#include "opkg_conf.h" -#include "opkg_message.h" -#include "opkg_download.h" -#include "opkg_utils.h" - -#include "args.h" -#include "pkg.h" - -extern int opkg_op(int argc, char *argv[]); /* opkglib.c */ - -#endif diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c index a335590..2107fc4 100644 --- a/libopkg/opkg_cmd.c +++ b/libopkg/opkg_cmd.c @@ -38,7 +38,6 @@ #include "opkg_upgrade.h" #include "opkg_remove.h" #include "opkg_configure.h" -#include "libopkg.h" #include "xsystem.h" static void diff --git a/src/Makefile.am b/src/Makefile.am index d078060..efdc19d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ AM_CFLAGS = -I${top_srcdir}/libopkg ${ALL_CFLAGS} bin_PROGRAMS = opkg-cl -opkg_cl_SOURCES = opkg-frontend.c +opkg_cl_SOURCES = opkg-cl.c opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.la \ $(top_builddir)/libbb/libbb.la diff --git a/src/opkg-cl.c b/src/opkg-cl.c new file mode 100644 index 0000000..74c82e6 --- /dev/null +++ b/src/opkg-cl.c @@ -0,0 +1,118 @@ +/* opkg-cl.c - the opkg package management system + + Florian Boor + + Copyright (C) 2003 kernel concepts + + 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. + + opkg command line frontend using libopkg +*/ + +#include "includes.h" + +#include "opkg_conf.h" +#include "opkg_cmd.h" +#include "file_util.h" +#include "args.h" +#include "opkg_download.h" + +#include "opkg_message.h" + +int +main(int argc, char *argv[]) +{ + int opts; + char *cmd_name; + opkg_cmd_t *cmd; + int nocheckfordirorfile = 0; + int noreadfeedsfile = 0; + + conf->verbosity = NOTICE; + + opts = args_parse (argc, argv); + if (opts == argc || opts < 0) + { + args_usage ("opkg must have one sub-command argument"); + } + + cmd_name = argv[opts++]; + + if ( !strcmp(cmd_name,"print-architecture") || + !strcmp(cmd_name,"print_architecture") || + !strcmp(cmd_name,"print-installation-architecture") || + !strcmp(cmd_name,"print_installation_architecture") ) + nocheckfordirorfile = 1; + + if ( !strcmp(cmd_name,"flag") || + !strcmp(cmd_name,"configure") || + !strcmp(cmd_name,"remove") || + !strcmp(cmd_name,"files") || + !strcmp(cmd_name,"search") || + !strcmp(cmd_name,"compare_versions") || + !strcmp(cmd_name,"compare-versions") || + !strcmp(cmd_name,"list_installed") || + !strcmp(cmd_name,"list-installed") || + !strcmp(cmd_name,"status") ) + noreadfeedsfile = 1; + + cmd = opkg_cmd_find (cmd_name); + if (cmd == NULL) + { + fprintf (stderr, "%s: unknown sub-command %s\n", argv[0], + cmd_name); + args_usage (NULL); + } + + conf->pfm = cmd->pfm; + + if (opkg_conf_init()) + goto err0; + + if (!nocheckfordirorfile) { + if (!noreadfeedsfile) { + if (pkg_hash_load_feeds()) + goto err1; + } + + if (pkg_hash_load_status_files()) + goto err1; + } + + if (cmd->requires_args && opts == argc) + { + fprintf (stderr, + "%s: the ``%s'' command requires at least one argument\n", + argv[0], cmd_name); + args_usage (NULL); + } + + if (opkg_cmd_exec (cmd, argc - opts, (const char **) (argv + opts))) + goto err2; + + print_error_list(); + free_error_list(); + + return 0; + +err2: +#ifdef HAVE_CURL + opkg_curl_cleanup(); +#endif +err1: + opkg_conf_deinit (); + +err0: + print_error_list(); + free_error_list(); + + return -1; +} diff --git a/src/opkg-frontend.c b/src/opkg-frontend.c deleted file mode 100644 index 5afb5b9..0000000 --- a/src/opkg-frontend.c +++ /dev/null @@ -1,28 +0,0 @@ -/* opkg-frontend.c - the itsy package management system - - Florian Boor - - Copyright (C) 2003 kernel concepts - - 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. - - opkg command line frontend using libopkg - -*/ - -#include - -/* This is really small, eh? ;-) */ - -int main(int argc, char *argv[]) -{ - return opkg_op(argc,argv); -}