r3880 - in trunk/src/target: . opkg opkg/familiar opkg/intercept opkg/libbb

thomas at sita.openmoko.org thomas at sita.openmoko.org
Fri Jan 18 12:31:16 CET 2008


Author: thomas
Date: 2008-01-18 12:30:53 +0100 (Fri, 18 Jan 2008)
New Revision: 3880

Added:
   trunk/src/target/opkg/
   trunk/src/target/opkg/AUTHORS
   trunk/src/target/opkg/ChangeLog
   trunk/src/target/opkg/INSTALL
   trunk/src/target/opkg/Makefile.am
   trunk/src/target/opkg/README
   trunk/src/target/opkg/TODO
   trunk/src/target/opkg/args.c
   trunk/src/target/opkg/args.h
   trunk/src/target/opkg/conffile.c
   trunk/src/target/opkg/conffile.h
   trunk/src/target/opkg/conffile_list.c
   trunk/src/target/opkg/configure.ac
   trunk/src/target/opkg/familiar/control-unstripped.in
   trunk/src/target/opkg/familiar/control.in
   trunk/src/target/opkg/familiar/libopkg-control.in
   trunk/src/target/opkg/familiar/libopkg-dev-control.in
   trunk/src/target/opkg/file_util.c
   trunk/src/target/opkg/hash_table.c
   trunk/src/target/opkg/hash_table.h
   trunk/src/target/opkg/intercept/depmod
   trunk/src/target/opkg/intercept/ldconfig
   trunk/src/target/opkg/intercept/update-modules
   trunk/src/target/opkg/libbb/libbb.h
   trunk/src/target/opkg/libbb/unarchive.c
   trunk/src/target/opkg/libopkg.c
   trunk/src/target/opkg/libopkg.h
   trunk/src/target/opkg/libopkg.pc.in
   trunk/src/target/opkg/md5.c
   trunk/src/target/opkg/nv_pair.c
   trunk/src/target/opkg/nv_pair_list.c
   trunk/src/target/opkg/opkg-frontend.c
   trunk/src/target/opkg/opkg.c
   trunk/src/target/opkg/opkg.h
   trunk/src/target/opkg/opkg.h.in
   trunk/src/target/opkg/opkg_cmd.c
   trunk/src/target/opkg/opkg_cmd.h
   trunk/src/target/opkg/opkg_conf.c
   trunk/src/target/opkg/opkg_conf.h
   trunk/src/target/opkg/opkg_configure.c
   trunk/src/target/opkg/opkg_configure.h
   trunk/src/target/opkg/opkg_download.c
   trunk/src/target/opkg/opkg_download.h
   trunk/src/target/opkg/opkg_extract_test.c
   trunk/src/target/opkg/opkg_hash_test.c
   trunk/src/target/opkg/opkg_install.c
   trunk/src/target/opkg/opkg_install.h
   trunk/src/target/opkg/opkg_message.c
   trunk/src/target/opkg/opkg_message.h
   trunk/src/target/opkg/opkg_remove.c
   trunk/src/target/opkg/opkg_remove.h
   trunk/src/target/opkg/opkg_upgrade.c
   trunk/src/target/opkg/opkg_upgrade.h
   trunk/src/target/opkg/opkg_utils.c
   trunk/src/target/opkg/opkg_utils.h
   trunk/src/target/opkg/pkg.c
   trunk/src/target/opkg/pkg.h
   trunk/src/target/opkg/pkg_depends.c
   trunk/src/target/opkg/pkg_depends.h
   trunk/src/target/opkg/pkg_dest.c
   trunk/src/target/opkg/pkg_dest.h
   trunk/src/target/opkg/pkg_dest_list.c
   trunk/src/target/opkg/pkg_extract.c
   trunk/src/target/opkg/pkg_hash.c
   trunk/src/target/opkg/pkg_hash.h
   trunk/src/target/opkg/pkg_parse.c
   trunk/src/target/opkg/pkg_src.c
   trunk/src/target/opkg/pkg_src_list.c
   trunk/src/target/opkg/pkg_vec.c
   trunk/src/target/opkg/pkg_vec.h
   trunk/src/target/opkg/sprintf_alloc.c
   trunk/src/target/opkg/str_list.c
   trunk/src/target/opkg/str_util.c
   trunk/src/target/opkg/update-alternatives
   trunk/src/target/opkg/user.c
   trunk/src/target/opkg/void_list.c
   trunk/src/target/opkg/xregex.c
   trunk/src/target/opkg/xsystem.c
Removed:
   trunk/src/target/ipkg/
   trunk/src/target/opkg/AUTHORS
   trunk/src/target/opkg/ChangeLog
   trunk/src/target/opkg/INSTALL
   trunk/src/target/opkg/Makefile.am
   trunk/src/target/opkg/README
   trunk/src/target/opkg/TODO
   trunk/src/target/opkg/args.c
   trunk/src/target/opkg/args.h
   trunk/src/target/opkg/conffile.c
   trunk/src/target/opkg/conffile.h
   trunk/src/target/opkg/conffile_list.c
   trunk/src/target/opkg/configure.ac
   trunk/src/target/opkg/familiar/control-unstripped.in
   trunk/src/target/opkg/familiar/control.in
   trunk/src/target/opkg/familiar/libipkg-control.in
   trunk/src/target/opkg/familiar/libipkg-dev-control.in
   trunk/src/target/opkg/file_util.c
   trunk/src/target/opkg/hash_table.c
   trunk/src/target/opkg/hash_table.h
   trunk/src/target/opkg/intercept/depmod
   trunk/src/target/opkg/intercept/ldconfig
   trunk/src/target/opkg/intercept/update-modules
   trunk/src/target/opkg/ipkg-frontend.c
   trunk/src/target/opkg/ipkg.c
   trunk/src/target/opkg/ipkg.h
   trunk/src/target/opkg/ipkg.h.in
   trunk/src/target/opkg/ipkg_cmd.c
   trunk/src/target/opkg/ipkg_cmd.h
   trunk/src/target/opkg/ipkg_conf.c
   trunk/src/target/opkg/ipkg_conf.h
   trunk/src/target/opkg/ipkg_configure.c
   trunk/src/target/opkg/ipkg_configure.h
   trunk/src/target/opkg/ipkg_download.c
   trunk/src/target/opkg/ipkg_download.h
   trunk/src/target/opkg/ipkg_extract_test.c
   trunk/src/target/opkg/ipkg_hash_test.c
   trunk/src/target/opkg/ipkg_install.c
   trunk/src/target/opkg/ipkg_install.h
   trunk/src/target/opkg/ipkg_message.c
   trunk/src/target/opkg/ipkg_message.h
   trunk/src/target/opkg/ipkg_remove.c
   trunk/src/target/opkg/ipkg_remove.h
   trunk/src/target/opkg/ipkg_upgrade.c
   trunk/src/target/opkg/ipkg_upgrade.h
   trunk/src/target/opkg/ipkg_utils.c
   trunk/src/target/opkg/ipkg_utils.h
   trunk/src/target/opkg/libbb/libbb.h
   trunk/src/target/opkg/libbb/unarchive.c
   trunk/src/target/opkg/libipkg.c
   trunk/src/target/opkg/libipkg.h
   trunk/src/target/opkg/libipkg.pc.in
   trunk/src/target/opkg/md5.c
   trunk/src/target/opkg/nv_pair.c
   trunk/src/target/opkg/nv_pair_list.c
   trunk/src/target/opkg/pkg.c
   trunk/src/target/opkg/pkg.h
   trunk/src/target/opkg/pkg_depends.c
   trunk/src/target/opkg/pkg_depends.h
   trunk/src/target/opkg/pkg_dest.c
   trunk/src/target/opkg/pkg_dest.h
   trunk/src/target/opkg/pkg_dest_list.c
   trunk/src/target/opkg/pkg_extract.c
   trunk/src/target/opkg/pkg_hash.c
   trunk/src/target/opkg/pkg_hash.h
   trunk/src/target/opkg/pkg_parse.c
   trunk/src/target/opkg/pkg_src.c
   trunk/src/target/opkg/pkg_src_list.c
   trunk/src/target/opkg/pkg_vec.c
   trunk/src/target/opkg/pkg_vec.h
   trunk/src/target/opkg/sprintf_alloc.c
   trunk/src/target/opkg/str_list.c
   trunk/src/target/opkg/str_util.c
   trunk/src/target/opkg/update-alternatives
   trunk/src/target/opkg/user.c
   trunk/src/target/opkg/void_list.c
   trunk/src/target/opkg/xregex.c
   trunk/src/target/opkg/xsystem.c
Log:
* Rename top level ipkg directory to opkg


Copied: trunk/src/target/opkg (from rev 3877, trunk/src/target/ipkg)

Deleted: trunk/src/target/opkg/AUTHORS
===================================================================
--- trunk/src/target/ipkg/AUTHORS	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/AUTHORS	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,5 +0,0 @@
-ipkg actually is maintained by Pierluigi Frullani <pigi at frumar.it>
-
-ipkg is being written by Carl Worth <cworth at handhelds.org> and Steve
-Ayer <steven.ayer at compaq.com>
-

Copied: trunk/src/target/opkg/AUTHORS (from rev 3879, trunk/src/target/ipkg/AUTHORS)

Deleted: trunk/src/target/opkg/ChangeLog
===================================================================
--- trunk/src/target/ipkg/ChangeLog	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ChangeLog	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,1761 +0,0 @@
-2006-05-30 pigi ( pigi at frumar.it)
-        * Version update to 0.99.163
-        * Fixed a bug in GNU_TAR_EXTENSION of unarchive.c. This fix #1666
-
-2006-05-04 pigi ( pigi at frumar.it)
-        * Fixed a little bug in makefile that inhibit the compilation from .tar.gz ( missing intercept dir )
-
-2006-04-20 pigi ( pigi at frumar.it)
-        * Version update to 0.99.162
-        * Fixed a bad bug introduced in .160 that was blocking the install of a package
-
-2006-04-18 pigi ( pigi at frumar.it)
-        * Version update to 0.99.161
-
-2006-04-18 pigi ( pigi at frumar.it)
-        * Another little fix for the  upgrade part.Now alse the prerm and postrm scripts gets deleted before upgrading.
-          wishing this fix the last troubles in upgrade part.
-        * Fix for #1585 after the bug introduced with the modify for offline root. ( Again )
-
-2006-03-30 pigi ( pigi at frumar.it)
-        * Activated the patch from Gunter at ohrner.net  for the md5 check of package
-        * Another change in the upgrade part, to handle the ghosts files from an upgraded package
-
-2006-03-30 pigi ( pigi at frumar.it)
-        * Version update to 0.99.160
-        * Fix for #1585 after the bug introduced with the modify for offline root.
-        * Patch from Gunter at ohrner.net  that fix a memory leak
-        * Not yet activated, but inserted a patch from Gunter at ohrner.net  for the md5 check of package
-
-2006-02-06 pigi ( pigi at frumar.it)
-        * Version update to 0.99.159
-        * Another change in the upgrade part, to handle the ghosts files from an upgraded package
-        *         Now it should be ok. Thanks to pb_ for pointing out where to look at.
-
-2006-02-02 pigi ( pigi at frumar.it)
-        * Version update to 0.99.158
-        * Modified the way upgrade handle the removing of a package, to be sure that ipkg doesn't break busybox upgrade
-        *          this should fix #1503
-        
-2006-01-30 pigi ( pigi at frumar.it)
-        * applied patch from pb_ for speed up things in boot ( to avoid multiple configure execution )
-        * applied patch from <r.schwebel at pengutronix.de> for 100+ filenames in tar file ( again )!
-        * applied patch from <r.schwebel at pengutronix.de> to avoid trouble in offlineroot installations.
- 
-2006-01-22 pigi ( pigi at frumar.it)
-        * Version update to 0.99.157
-
-2006-01-17 pigi ( pigi at frumar.it)
-	* Added a check to avoid reading feed files with several options. This should fix #1458 and speed up a lot of executions.
-
-2006-01-12 pigi ( pigi at frumar.it)
-        * Version update to 0.99.156
-        * Fixed a length problem for strncpy when "Installing" option added. This fix bug #1456. Thanks to hrw for signaling
-
-2005-12-15 pigi ( pigi at frumar.it)
-        * Version update to 0.99.155
-        * Added a function to remove the package that is being upgraded.
-        * Fixed a problem when installing by hand. Now ipkg knows that a package has been selected by hand, 
-        *       and, if every check returns ok, it install the wanted package, instead of selecting one from feed.
-        *       Moreover, now downgrade should works again.
-        * Fixed the "Replaces" bug. Now ipkg is able to replace a package also if it doesn't conflict.
-        * Other minor changes in debug options
-
-2005-09-15 pigi ( pigi at frumar.it)
-	* Version update to 0.99.154
-        * Corrected a problem when removing a package, caused by an off by one alignement with the "Provides:" String
-        * Patched for the "depends:" bug introduced after the "Provides:" fix. This fix #1393
-        * Added a little fix for an off-by-one error in checking for depends.
-
-2005-07-29 pigi ( pigi at frumar.it)
-        * Applied a patch for the GNU tar compatibility . Now ipkg can handle filenames > 100 char.
-
-2005-07-29 pigi ( pigi at frumar.it)
-	* Version update to 0.99.153
-        * Fixed a problem with Provides:. Now ipkg is able to install foo when foo is provided by bar, and is able to determine the best candidate based on 
-        * package name. This also fix #1328
-
-2005-07-06 pigi ( pigi at frumar.it)
-	* Version update to 0.99.152
-        * Fixed a length problem for strncpy after "Downgrading" option added. This fix bug #1373. Thanks to steven.scholz at imc-berlin.de for signaling
-
-2005-06-16 pigi ( pigi at frumar.it)
-	* Version update to 0.99.151
-        * Fixed a missing check for null pointers . This fix bug #1358
-
-2005-06-05 pigi ( pigi at frumar.it)
-	* Version update to 0.99.150
-        * Added the -force-downgrade option to allow the downgrade of a package
-
-2005-05-11 pigi ( pigi at frumar.it)
-	* Version update to 0.99.149
-        * Added the possibility to choice the ipkglibdir from configure ( --with-libipkgdir )
-
-2005-04-10 pigi ( pigi at frumar.it)
-	* Version update to 0.99.148
-
-2005-04-09 pigi ( pigi at frumar.it)
-	* Found a bug in output from error_list. Now every error is printed, also if the functions don't return an error.
-        * Added a patch to Makefile from Robert Schwebel <r.schwebel at pengutronix.de>, cleaning things  a bit. Thanks to Schwebel
-
-2005-03-30 pigi ( pigi at frumar.it)
-	* Version update to 0.99.147
-        * Found a bug in ipkg_install when freeing a cursor 
-
-2005-03-28 pigi ( pigi at frumar.it)
-	* Version update to 0.99.146
-        * Modified the ipkg_error messaging to collect all the messages at the end of the program
-
-2005-03-26 pigi ( pigi at frumar.it)
-        * Little bug in message when "depends broken" 
-
-2005-03-14 pigi ( pigi at frumar.it)
-	* Version update to 0.99.145
-	* Found a bug in ipkg remove when a package was depending in itself and ipkg where asked to "-recursive"
-          This fix bug # 1301
-        * A very little beautify in args.c
-
-2005-03-07 pigi ( pigi at frumar.it)
-	* Added the check for md5 in resolv_conf_file. Now ipkg ask for confirmation only it the files differ
-
-2005-02-22 pigi ( pigi at frumar.it)
-	* Version update to 0.99.144
-	* A little fix suggested by drw in ipkg_conf.c
-	* Changed the ipkg.h to be build in automake for oe mechanism . This will enhance the building phase 
-          by honouring the lib hierarchy choose by users
-        * Changes in automake to honour the new building mechanism
-
-2005-02-20 pigi ( pigi at frumar.it)
-	* Version update to 0.99.143
-	* libipkg.h: reverting the previous modify
-        * ipkg_conf.c: fixing a probable bug in list_dir that fix problems with opie-packagemanager ( tanks to drw for signaling)
-
-2005-02-20 pigi ( pigi at frumar.it)
-	* libipkg.h: added some define to fix the broken external interface after 0.99.139 and lists_dir
-
-2005-02-17 pigi ( pigi at frumar.it)
-	* pkg_depends.c: applied patch from rjt at cambridgebroadband.com to remove some c99ism 
-
-2005-02-06 pigi ( pigi at frumar.it)
-	* Version update to 0.99.142
-        * Fixed the definition of full_write and full_read as per bug #1280
-
-2005-02-06 pigi ( pigi at frumar.it)
-	* Version update to 0.99.141
-        * Added space in ipkg_message to give more readible messages
-        * Corrected a problem when creating the directories in pkg_dest_init
-
-2005-02-05 pigi ( pigi at frumar.it)
-	* Version update to 0.99.140
-        * Fixed the bug in ipkg_conf for a wrong pointer.
-
-2005-02-05 pigi ( pigi at frumar.it)
-	* Version update to 0.99.139
-        * Fixed the "replaces" problem  reported by pb_. Now ipkg is able to resolve a "replace/conflict" reference
-        * Added the possibility to keep the lists file in a different location. Fullfill enh #1276
-
-2005-02-02 pigi ( pigi at frumar.it)
-        * Fixed the problem for SW_DEINSTALL in remove. Fix #1274
-        * Fixed the problem issued from florian. This also fix the bug #520 HardLink are now supported
-
-2005-01-18 pigi ( pigi at frumar.it)
-	* Version update to 0.99.138
-	* libbb.h: patch for the uclib 
-
-2005-01-14 pigi ( pigi at frumar.it)
-	* ipkg_install.c: applied patch from rjt at cambridgebroadband.com to remove some c99ism 
-
-2005-01-14 jamey ( jamey at handhelds.org )
-	* pkg_hash.c: applied patch from Jean Tourrilhes to allow default
-	  arch to be different than host arch
-	
-2005-01-10 pigi ( pigi at frumar.it)
-	* Version update to 0.99.137
-        * fixed a little, but annoying bug when writing the status file.
-
-2005-01-10 pigi ( pigi at frumar.it)
-	* Version update to 0.99.136
-        * Lot of memory leak fixes from Benjamin Pineau <ben at zouh.org>
-        * Fix for the Provides, that weren't able to "protect" their dependants while removing. 
-          Now the remove should be safer.
-        * removed the replace.h stuff from automake .ac/.in files. This should align to oe
-
-2005-01-06 pigi ( pigi at frumar.it)
-	* Version update to 0.99.135 
-	* Various fix for dependencies in control files
-
-2005-01-06 pigi ( pigi at frumar.it)
-	* Version update to 0.99.134-1 for fixing a problem with cvs tag on previous version
-
-2005-01-06 pigi ( pigi at frumar.it)
-	* Version update to 0.99.134
-        * Added a new option for listing only the installed packages. Asked by pb_ but really important
-	* Little modification to autoconfigure.sh 
- 	* removed fileutils dependencies that has disappeared from 0.8 in control-cl.in  control-unstripped.in libipkg-control.in  
-
-2004-11-18 pigi ( pigi at frumar.it)
-	* Version update to 0.99.133
-        * Fix for preserve date and time when extracting a package. Thanks to <trevor.pering at intel.com>
-
-2004-10-07 pigi ( pigi at frumar.it)
-	* Version update to 0.99.132
-        * Little fix on available blocks calculation. Thanks to seved.torstendahl at netinsight.se for founding it.
-        * this fix #1259
-
-2004-09-20 pigi ( pigi at frumar.it)
-	* Version update to 0.99.131
-        * Added a lot of debug info in DEBUG2
-        * Added a check in ipkg_install.c to permit replacing of existing file when installing a package
-        * from a file ( not an upgrade ) when ipkg find a file clash but the owner of the package is the 
-        * same. That should fix the #1246
-
-2004-09-02 pigi ( pigi at frumar.it)
-	* Version update to 0.99.130
-        * Added patch from pb_ for bug #1251. A lot of thanks to Phil
-
-2004-09-02 pigi ( pigi at frumar.it)
-        * Some changes on output messages to be a little bit clear
-
-2004-09-01 pigi ( pigi at frumar.it)
-        * Applied patches from pb_ (bug #1244)
-        * Added EXTRADIST = ipkg.c and others in Makefile.am as in ipkg.0.99.xxx.tar.gz the ipkg.c was missing. ( 
-          reported by odvard12 at yahoo.com )
-	* Version update to 0.99.129
-
-2004-08-19 Florian <florian.boor at kernelconcepts.de>
-	* Version update to 0.99.128
-	* libipkg.c, ipkg_cmd.c: Fixed return value zero if installation
-	  failed. Changed text because failing to install a package
-          is not necessarily a bug :-)
-	* Makefile.in, libbb/Makefile.in: Removed autogenerated files.
-
-2004-08-18 Florian <florian.boor at kernelconcepts.de>
-	* Two more fixed memory leaks.  Contributed by Nils Faerber.
-
-2004-08-17 Florian <florian.boor at kernelconcepts.de>
-	* Fix to avoid major memory leak due to multiple initialising
-          of hash tables. Contributed by Nils Faerber.
-
-2004-07-20  pigi ( pigi at frumar.it)
-	* configure.ac: updated to 0.99.127
-        * Applied patch from tmbinc at elitedvb.net (Felix Domke)  to fix some problems when in use on platforms
-        * different from arm. Fixes big #1234
-2004-06-15  pigi ( pigi at frumar.it)
-	* configure.ac: updated to 0.99.126
-2004-06-12 florian <florian.boor at kernelconcepts.de>
-	* Makefile.am: Added some missing headers to the list.
-	* libipkg.pc.in: Fixed hardcoded prefix... tsts
-2004-06-12 pigi ( pigi at frumar.it)
-        * pb_ patch for setuid bit in unarchive
-2004-06-05 pigi ( pigi at frumar.it)
-	* configure.ac: updated to 0.99.125
- 	* modified almost all reference to xregexec in fnmatch ( as adviced by zap).
-          This should fix every problem with strange character in package name when using regex in functions
-          ( as per info_status_cmd or remove ). #1220
-2004-05-21 pigi ( pigi at frumar.it)
-	* configure.ac: updated to 0.99.124
-        * import the kergoth patch for Makefile.am to fix the linking problems on arch <> arm
-        * added the ipkg remove <regexp> feature.
-        * fixed the ipkg usage message, 'cause in "ifdef LIBIPKG" we don't have the ipkg info field version.
-        * added the message "No package removed" if no package has been removed. This to avoid misunderstanding
-          with the successfully done message at the exit of execution.
-2004-05-16 pigi ( pigi at frumar.it)
-	* configure.ac: updated to 0.99.122-3
-        * Anothere little fix. Added the version number in control.in. This should fix definitelly the problem with dependencies
-2004-05-16 pigi ( pigi at frumar.it)
-	* configure.ac: updated to 0.99.122-2
-        * New subrelease released to correct the problem for dependencies (libipkg >= 0.99.122-1) in ipkg control file
-2004-05-14 pigi ( pigi at frumar.it)
-	* configure.ac: updated to 0.99.122-1
-        * needed for a recompilation with the libtool updated. This could fix the #1209 created by my old libtool version
-        * cleaned the cvs dir by removing the really unneeded busybox directory
-2004-05-10 pigi ( pigi at frumar.it)
-	* configure.ac: updated to 0.99.122
-        * pb_, cworth and I discussed a bit on ipkg output to users. We agreed on removing some confusing
-        * messages, moving them to a debug level of verbosity.
-        * I do added also some message to user indicating the phase ipkg is in, and a global ending message
-        * informing the user for the status of operation.
-        * This fixes the #1206, and hopefully does not introduce others ;-) 
-2004-05-03 pigi ( pigi at frumar.it)
-	* configure.ac: updated to 0.99.121
-        * reenoo__ found a problem with depend lines > 1023, and pb fixed it. Thanks to both,
-        * This should fix #1204.
-2004-04-08 pigi ( pigi at frumar.it)
-	* configure.ac: updated to 0.99.120
-        * pb found another one. The configure cmd now will set the correct values in status file
-        * #1196 fixed
-2004-04-07 pigi ( pigi at frumar.it)
-	* configure.ac: updated to 0.99.119
-        * pb found another one. Commiting his patch, elegant as usual :) 
-2004-03-29 jamey ( jamey at handhelds.org)
-	* configure.ac: updated to 0.99.118
-2004-03-29 pigi ( pigi at frumar.it)
-        * pb_ asked me to have a command to change the status of a package betwenn installed and unpacked.
-          and I did it.
-        * I' ve also included the fix for the empty lists as for bug # 1136 reported and suggested by k.vangelder at chello.nl 
-2004-03-17 pigi ( pigi at frumar.it)
-        *  Added the implement for Essential in status file. This is needed to avoid the unintentional remove
-           of essential packages. In effect the command "ipkg remove ipkg" worked without problems, but then
-           it was difficult to reinstall. This fix the bug # 867
-2004-03-15 jamey <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.117
-2004-03-10 pigi ( pigi at frumar.it)
-        *  Added the check for *alloc in every source. I needed to modify some function ehre and there
-           to check the return values from function allocating memory, but hopefully it should be all right now.
-        *  Added the check for at least a package for remove ( it was removing everithing if no pkgname followed the
-           remove option.
-2004-03-09 pigi ( pigi at frumar.it)
-        *  Added a flag to disble the checking of directories when the command does not need to 
-           read anything from there. Fix bug #1096
-2004-03-09 pigi ( pigi at frumar.it)
-        *  Changes to correct the behaviour of verbosity. Now the "0" works, and the "1" is again 
-           the default.
-           This fixes the bug #1099
-2004-03-07 pigi ( pigi at frumar.it)
-        *  Minimal changes for a clean compile in libipkg.c ( so we can close the bug# 1119 )
-2004-03-03 pigi ( pigi at frumar.it)
-        * Missing \n in Size and Source Fields.
-2004-03-03 pigi ( pigi at frumar.it)
-        * Florian noticed a free missiing in ipkg_cmd.c ( should sleep more at night ) 
-          it was in an (almost) unsed part of the code ( old code ) but, just in case...
-        * Changed a comment in pkg.c ( it was in italian ) and added a bit of explain in 
-          pkg_formatted_field
-2004-03-02 jamey <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.116
-	* pkg.h: from Pigi: pkg_formatted_info and pkg_formatted_field now allocate the strings they fill in
-	* pkg.c, ipkg_cmd.c: from Pigi: updated to the new pkg.h interface 
-2004-02-29 florian <florian.boor at kernelconcepts.de>
-	pkg.c: Pigi and me poked around a little bit and located the cause of
-	       latest segfault. strncat is not used correctly in pkg_formatted_info
-		   and pkg_formatted_field. I added a fix to the only section that
-		   triggered the bug and increased a buffer size.
-		   BUT: There are many similar bugs remaining!
-2004-02-24 jamey <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.115
-	* ipkg_cmd.c: segv caught by pigi: buffer freed in loop but used on next iterations.  bug squashed.
-	* user.c: realloc question buffer if it is too short so that messages are not truncated.
-2004-02-20 jamey <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.114
-	* libbb/unarchive.c: patch from pigi at frumar.it: fix erroneous invalid header checksum message
-2004-02-19 jamey <jamey.hicks at hp.com>
-	* configure.ac: update to 0.99.113
-	* libipkg.c: patch from drw to fix ipkg list
-2004-02-19 florian <florian.boor at kernelconcepts.de>
-	* Some minor changes to make code compile on more compilers.
-2004-02-14 jamey <jamey.hicks at hp.com>
-	* configure.ac: updated to 0.99.112
-        * libbb/unarchive.c: copied in oldgnu tar compatibility mode from latest busybox.
-2004-02-13 jamey <jamey.hicks at hp.com>
-	* configure.ac: updated to 0.99.111
-        * pkg.c: wim delvaux's patch for status file in other destinations
-2004-01-23 florian <florian.boor at kernelconcepts.de>
-	* Applied Dan's patch that adds a package download command to
-	  libipkg.	
-2004-01-20 florian <florian.boor at kernelconcepts.de>
-	* Applied Dan's changes to work incuded from a C++ app.	
-2004-01-15 jamey
-	* configure.ac: updated to 0.99.110
-	* libipkg.c: added default callbacks for output
-	* ipkg_conf.c: default verbosity to 1
-2004-01-12 jamey
-	* configure.ac: updated to 0.99.109
-	* ipkg_install.c: fix potential segv sprintf_alloc with fewer args than required by format string (yay valgrind)
-	* sprintf_alloc.c: add null pointer checking
-2004-01-12 jamey
-	* configure.ac: updated to 0.99.108
-	* Makefile.am, familiar/: use ipkg-cl as default executable, install as ipkg via update-alternatives
-2004-01-12 jamey
-	* configure.ac: updated to 0.99.107
-	* void_list.c: check for null data
-	* pkg.c: check for null pointers
-2003-12-23 florian <florian.boor at kernelconcepts.de>
-	* Added void* parameter to some callbacks. 
-
-2003-12-02 florian <florian.boor at kernelconcepts.de>
-	* Added familiar/ipkg-cl.control.in, which is a prototype of
-	  control file for ipkg-cl package creation.
-2003-12-01 florian <florian.boor at kernelconcepts.de>
-	* added ipkg command line tool using libipkg, binary is known as ipkg-cl
-	* ipkg-frontend.c: source for this tool
-	* libbb/Makefile.am: Removed changing of CFLAGS, this avoids a nasty warning.
-	* Makefile.am: Same fix and addition of new target creating ipkg-cl.
-	* removed ltmain.sh, libtool which seem to be created by autostuff
-	
-2003-12-01 jamey
-	* configure.ac: updated to 0.99.106
-	* pkg.c, ipkg_conf.c: check for null pointers (null pkg->dest in particular)
-2003-11-11 jamey
-	* configure.ac: updated to 0.99.105
-	* ipkg_conf.c: added verbosity option to conf file
-2003-11-11 jamey
-	* configure.ac: updated to 0.99.104
-	* ipkg_install.c: removed spurious calls to fflush, remove obsolete maintainer scripts on upgrade
-	* ipkg_remove.c: remove unused function: remove_conffiles
-2003-11-11 jamey
-	* configure.ac: updated to 0.99.103
-	* libipkg.pc.in, configure.ac: pkgconfig for libipkg
-	* ipkg_conf.c, pkg.c: check for error on fopen
-	* pkg_hash.c: reduced verbosity
-	* libtool: arm-linux-strip does not support --strip-debug on .a files
-2003-11-10 jamey
-	* configure.ac: updated to 0.99.102
-	* ipkg_cmd.c: compute architecture_priority of packages in database before doing download command
-	* conffile.c file_util.[ch] ipkg_install.c: better separation of installation root filenames and actual filenames
-	* pkg.h: added prototype for pkg_free_installed_files
-2003-11-10 jamey
-	* configure.ac: updated to 0.99.101
-	* libipkg changes
-	* generate .list files from file_hash
-2003-11-05 jamey
-	* configure.ac: updated to 0.99.100
-	* ipkg_install.c: fix segv: was passing conflictee->parent instead of conflictee
-2003-10-08 jamey
-	* configure.ac: updated to 0.99.99
-	* ipkg_install.c: use the root_dir after stripping off offline_root prefix
-2003-10-08 jamey
-	* configure.ac: updated to 0.99.98
-	* pkg_hash.c: fixed segv if replaced_by->len was 0
-	* ipkg_cmd.c: ipkg remove with no arguments will remove non-user leaf packages
-	* ipkg_remove.[ch]: export pkg_has_installed_dependents
-	* pkg_depends.c: add pkg->parent to pkg->provides
-	* ipkg_install.c: strip offline_root prefix off of conffile name so comparing the md5sums should work
-	* pkg.c: missing comma added
-2003-10-01 jamey
-	* configure.ac: updated to 0.99.97
-	* ipkg_cmd.c: added whatdependsrec command to show what recursively depends on a package or packages
-	* pkg_vec.[ch]: added pkg_vec_clear_marks and pkg_vec_mark_if_matches
-	* args.c: usage string updated
-2003-09-28 jamey
-	* configure.ac: updated to 0.99.96
-	* ipkg_conf.c: adjusted verbosity
-	* ipkg_install.c: only remove replacee if it is also conflicted, per debian standard
-	* pkg_depends.c: only add to replaced_by if it also conflicts, per debian standard
-		added pkg_provides, pkg_replaces, pkg_conflicts
-	* pkg_hash.c: adjusted verbosity	          
-2003-09-28 jamey
-	* configure.ac: updated to 0.99.95
-	* args.[ch], ipkg_cmd.c, ipkg_conf.[ch], ipkg_download.c, ipkg_install.c, ipkg_remove.c, pkg.[ch]:
-	   Implemented -test mode for ipkg.
-2003-09-28 jamey
-	* configure.ac: updated to 0.99.94
-	* pkg_hash.c: fix pkg_hash_fetch_best_installation_candidate so
-	that one can install another provider of an installed package name
-2003-09-26 jamey
-	* configure.ac: updated to 0.99.93
-	* ipkg_install.c: corrected message level depending on conf->force_depend
-	* ipkg_conf.c: check for duplicate src entries
-	* nv_pair_list.[ch]: added nv_pair_list_find
-2003-09-16 jamey
-	* configure.ac: updated to 0.99.92
-	* pkg_depends.c: some paranoia to try to avoid segv
-	* void_list.c: silenced message about elt not being found
-2003-09-11 jamey
-	* configure.ac: updated to 0.99.91
-	* pkg_depends.c: added pkg_depend_str to fetch right kind of dependence string based on dependence index
-	                 Use this in add_unresolved_dep.
-	* pkg_depends.h: declaration of pkg_depend_str
-2003-08-22 11:02  jamey
-	* configure.ac: updated to 0.99.90
-	* str_list.[ch]: added str_list_alloc(), added str_list_remove_elt()
-	* void_list.[ch]: added void_list_remove_elt()
-	* pkg_parse.c: added parsing of Source field
-	* pkg_hash.c: updated old_pkg->installed_files list when setting file owner if it was previously owned by old_pkg
-	* pkg_extract.c: use installed_file list if it exists in pkg_extract_data_file_names_to_file
-	* pkg.[ch]: added pkg_write_filelist() and pkg_write_changed_filelists()
-	* ipkg_remove.c: do not call ipkg_conf_write_status_files from ipkg_remove
-	* ipkg_install.c: use ipkg_write_filelist()
-	* ipgk_cmd.c: after writing status file, write any changed pkg filelists
-2003-08-20 11:02  jamey
-	* configure.ac: updated to 0.99.89
-	* pkg.c: print Source field in pkg_print_info
-2003-08-06 18:34  jamey
-	* configure.ac: updated to 0.99.88
-	* pkg_hash: bug 942, declare internal induction variable
-	* ipkg_cmd.c, ipkg_conf.[ch], pkg_src.[ch], pkg_src_list.[ch]: bug 604, support Packages.gz
-2003-08-06 18:34  jamey
-	* configure.ac: updated to 0.99.87
-	* pkg.c: remove extra printing of Suggests field
-	* pkg_vec.c: merge Status field only from current database, rest of Package info from Packages files
-	* pkg_depends.c: print info about recommendations as Notice instead of DEBUG
-2003-07-11 18:34  jamey
-	* configure.ac: updated to 0.99.86
-	* ipkg.h, ipkg_cmd.c, ipkg_configure.c, ipkg_install.c, ipkg_remove.c: only write status file if something changed.
-2003-07-11 18:34  jamey
-	* configure.ac: updated to 0.99.85
-	* pkg.c, pkg.h, pkg_depends.c, pkg_depends.h, pkg_parse.c: bug 885:
-	  add recommends and suggests
-	* args.c, ipkg_cmd.c, ipkg_cmd.h: add ipkg configure command
-	* pkg_vec.c: apply patch for bug 883
-2003-05-11 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.84
-	* pkg.c, ipkg-compare-versions.c: fix problem where . and - were not treated as separators in version comparison
-2003-04-11 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.83
-	* ipkg_install.c: use pkg->installed_size instead of pkg->size
-	* ipkg_cmd.c, ipkg_conf.c: put lists under offline_root if specified
-2003-04-11 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.82
-	* pkg_hash.c: ignore Replaces directive when a package replaces itself
-2003-04-10 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.81
-	* pkg.c: clear state_want and state_flags for any uninstallable package
-2003-04-10 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.80
-	* pkg.c: pkg_merge was intermingling depends and predepends from
-		old and new pkg, and was ignoring conflicts and replaces 
-	* pkg_depends.c: cleaned up interface to parseDepends
-2003-04-07 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.79
-	* pkg_hash.c: default architecture to host_cpu if unspecified
-	* ipkg_install.c, ipkg_download.c: refuse to install package with no architecture
-2003-04-07 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.78
-	* args.[ch], ipkg_conf.[ch]: added query_all (-A)
-	* ipkg_cmd.c: finished implementing whatdepends, whatrequires, whatprovides, and whatconflicts
-2003-04-03 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.77
-	* ipkg_cmd.c: implemented whatdepends
-	* ipkg_conf.c: fixed typo
-2003-04-03 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.76
-	* args.c: was zeroing args structure too late
-	* ipkg_conf.c: test for existence of /etc/ipkg.conf before trying to load it
-2003-04-03 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.75
-	* familiar/rules: update postinst only to generate ipaqarch.conf if none exists
-	* args.[ch]: added -t or --tmp-dir option to specify tmp-dir
-2003-04-03 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.74
-	* ipkg_cmd.c: avoid segv by only calling xregfree after xregcomp was called
-	* pkg_hash.c: prefer pkgs that are marked hold/prefer, next
-	abstract pkgs that are installed, next latest pkg if one provider,
-	give up if multiple providers are acceptable -- let user decide
-2003-04-03 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.73
-	* pkg_hash.c: remove latest_installed heuristic because it prevents upgrades.
-2003-04-03 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.72
-	* pkg_hash.c: check for unresolved packages (apkg->provided_by->len == 0), better messages.
-2003-04-03 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.71
-	* pkg.c: Added pkg_name_version_and_architecture_compare and abstract_pkg_name_compare
-	* ipkg_cmd.c: allow multiple fields for info and status command.
-	Allow posix regexp's for package name in status, info, and list
-	commands.
-	* pkg_remove.c: fixed type error
-	* xregex.h: added xregfree
-	* pkg_hash.c: Provides functionality seems to be working again
-2003-04-02 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.70
-	* args.c, args.h, ipkg_conf.c, ipkg_conf.h, ipkg_install.c: implemented nodeps option
-	* pkg_vec.[ch]: added [abstract_]pkg_vec_{contains,sort}
-	* pkg.c: print which script not being run in offline root mode
-2003-04-02 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.69
-	* pkg_vec.c: compare architecture to architecture, not to name
-	* ipkg_utils.c: do not exit, instead return NULL
-	* ipkg_install.c: do not exit, instead return -EINVAL
-	* ipkg_download.c: make sure to set pkg dest
-	* ipkg_cmd.c: notice instead of info for writing status file message
-2003-04-02 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.68
-	* pkg_vec.c, pkg_depends.c: pkg_t's are the same if they have same name, version, and architecture 
-2003-04-01 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.67
-	* ipkg_install.c: one last check for supported architecture in ipkg_install_pkg
-	* pkg.c: make pkg_print_field less fragile by using strcasecmp,
-	added support to print Conflicts
-	* pkg_hash.c: if multiple candidates with right architecture
-	satisfy constraint_fcn, return latest version
-	* ipkg_cmd.c: when verbosity > 1, show if conffiles have been
-	modified in info command
-	* hash_table.c, hash_table.h: count number of elements in hash
-	tables
-	* file_util.c: explicitly use unsigned char
-	* conffile.c: more debugging info
-2003-04-01 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.66
-	* pkg_depends.c: fixed what seemed to be glaring deficiency in version_constraints_satisfied
-	* pkg_hash.c: more debug info
-	* pkg_parse.c, pkg.c: added Installed-Time as field saved to status file
-2003-04-01 Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.65
-	* ipkg_cmd.c, ipkg_conf.c: applied ipkg dest installation patch from Ben Lau <benlau at linux.org.hk>
-	* ipkg_cmd.c: fixed probably segv when using offline_root, fixed problem installing from local file.
-	* ipkg_conf.c: 
-	  - Do not add default architectures if ipkg configuration files include architecture definitions.
-	  - Look for /etc/ipkg/*.conf under offline root if using offline root mode
-	* void_list.h: added void_list_empty()
-	* nv_pair_list.h: added nv_pair_list_empty()
-2003-03-28 14:30  Jamey Hicks <jamey at handhelds.org> 
-	* configure.ac: 0.99.64
-	* pkg_hash.c: change fprintf stderr to ipkg_message
-	* pkg.h: added SF_MARKED and abstract_pkg_t state_flag field
-	* pkg.c: include Provides, Replaces, and Architecture in status
-	file
-	* ipkg_remove.c: make sure to print each dependent package only
-	once
-	* ipkg_message.h: added IPKG_DEBUG2
-	* ipkg_install.c: modify message and level depending on
-	force_depends
-	* ipkg_cmd.c: call pkg_info_preinstall_check before any
-	install/upgrade/remove action
-	* ChangeLog, autoconfigure.sh, includes.h,
-	ipkg_conf.c, ipkg_remove.c, pkg.c, pkg.h, update-alternatives,
-	xregex.h: applied kergoth's update-alternatives patch
-	* ipkg_cmd.c, ipkg_remove.c: remove maybe_broken_removal... which
-	was an expensive no-op; before removing package, make sure that
-	nothing is installed that depends on the apkgs **provided** by a
-	package
-	* pkg.h: mark for future cleanup
-	* ChangeLog: 0.99.62, adds architecture priority, better handling
-	of file obsolescence and package replacements in progress
-2003-03-27 18:26  jamey
-	* autoconfigure.sh: accidentally committed /usr/local/bin calls
-	* ipkg_conf.c: needed a strdup, set default verbosity back to 0
-	* familiar/postinst: default architecture priorities
-	* Makefile.in, autoconfigure.sh, ipkg_cmd.c, ipkg_conf.c, pkg.c:
-	both name and value in nv_pair_list must be actual strings
-	* pkg_hash.c: do not try to invoke NULL constraint_fcn
-	* ipkg_install.c: added file_hash_{set,get}_file_owner, created
-	check_downgrade
-	* ipkg_conf.c, ipkg_conf.h, ipkg_remove.c, pkg.c, pkg_hash.c,
-	pkg_hash.h: added file_hash_{set,get}_file_owner
-	* hash_table.c: check for key already being present in
-	hash_table_insert
-	* configure.ac: update to 0.99.63
-	* ipkg_hash_test.c: update due to new prototypes
-	* ipkg_conf.c: missed a conversion from str_list to nv_pair_list
-	* ipkg_install.c: minor tweaks
-	* pkg.c, pkg.h: added pkg_info_preinstall_check to update
-	pkg->arch_priority
-	* pkg_depends.c, pkg_depends.h: use constrained
-	pkg_hash_fetch_best_installation_candidate in
-	pkg_hash_fetch_unsatisfied_dependencies
-	* pkg_hash.c, pkg_hash.h, ipkg_cmd.c, ipkg_upgrade.c: split
-	pkg_hash_fetch_best_installation_candidate into a by name and a
-	constrained version
-	* ipkg_install.c: block SIGINT while doing core of package
-	installation (single package)
-	* ipkg_conf.c, ipkg_conf.h: support for architecture priority
-	* pkg_depends.c: cleanup, reindent
-	* pkg.c, pkg.h: support for architecture_priority
-	* ipkg_cmd.c: installed SIGINT handler when upgrading or removing,
-	support for architecture_priority
-	* pkg_hash.c: added support for architecture priority, reindented
-	* pkg_vec.c: minor cleanup
-2003-03-24  Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.61
-	* familiar/postinst: mkdir -p /etc/ipkg
-2003-03-24  Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.61
-	* ipkg_conf.c: read configuration from all *.conf files in /etc/ipkg/
-	* familiar/postinst: create /etc/ipkg/*.conf according to platform ipkg is installed on
-2003-03-20  Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.60
-	* various: added support for package architectures
-	* configure.ac: do not test for malloc
-2003-03-17  Aman Gupta <ipkg at themastermind1.net>
-	* configure.ac: updated to 0.99.59
-	* args.c: show all verbosity levels in usage info
-	* args.h: changed default verbosity level to 1
-	* ipkg_cmd.c: ipkg_multiple_files_scan() was useless, switch to using 
-	ipkg_prepare_url_for_install()
-	* ipkg_install.c: fix --force-reinstall
-	* ipkg_remove.c: stop removing of modified conffiles
-2003-03-04  Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.56
-	* ipkg_message.c: show error messages by default
-	* ipkg_message.h: protect against multiple inclusion
-	* conffile.[ch]: switch to ipkg_message, added conf argument to conffile_has_been_modified
-	* ipkg.h: move EXTENSION macros here
-	* pkg_depends.c: minor cleanup
-	* pkg.h: added prefer and obsolete flags
-	* pkg.c: parse and unparse SF_PREFER and SF_OBSOLETE
-	* ipkg_install.[ch]: 
-	  - added {pkg,name}_mark_dependencies_for_installation, 
-	  - added conf argument to conffile_has_been_modified 
-	  - missing ifdef IPKG_DEBUG_NO_TMP_CLEANUP
-	* ipkg_remove.c: added conf argument to conffile_has_been_modified
-	* ipkg_download.c: added ipkg_prepare_for_install
-2003-03-01  Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.55
-	* ipkg.h: wrap #if 0 around definition of of IPKG_DEBUG_NO_TMP_CLEANUP
-2003-03-01  Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.54
-	* ipkg_install.c: make old package SW_DEINSTALL during ipkg installation
-	* ipkg_cmd.[ch]: added some code to install packages marked SW_INSTALL, but have not enabled this code yet.
-2003-03-01  Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: updated to 0.99.53
-	* pkg_depends.c: let SW_INSTALL satisfy dependences (instead of SS_INSTALL)
-2003-03-01  Daniele Nicolodi <daniele at grinta.net>	
-	* ipkg_install.c: indentation fixes and finish switch to message
-	facility
-	* ipkg_cmd.c: indentation fixes, switch to message facility and
-	some code cleanup
-	* ipkg_message.c (ipkg_message): check for a NULL *conf parameter
-	* ipkg_message.h: renamed IPKG_ERR in IPKG_ERROR
-2003-02-28  Jamey Hicks <jamey at handhelds.org> (patch from Daniele Nicolodi <daniele at grinta.net>)
-	* configure.ac: incremented version to 0.99.5
-	* ipkg_message.[ch]: added message facility
-	* args.[ch]: verbosity control
-	* ipkg_conf.[ch]: verbosity control
-	* ipkg_install.c: switch to using message factility
-2003-02-28  Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: incremented version to 0.99.51
-	* ipkg_cmd.c: added ipkg_statisfy_all_dependences, called after
-	install/upgrade of packages to handle packages that were split and
-	no longer provide all the resources they used to provide.
-2003-02-27  Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: incremented version to 0.99.50
-	* ipkg_cmd.c: write out status after doing an upgrade
-2003-02-27  Jamey Hicks <jamey at handhelds.org> (another patch from pb)
-	* configure.ac: incremented version to 0.99.49
-	* pkg_parse.c, pkg.c: do not treat deb revision specially
-2003-02-27  Jamey Hicks <jamey at handhelds.org> (another patch from pb)
-	* configure.ac: incremented version number to 0.99.48
-	* args.c: added help for ipkg flags sub-command
-	* ipkg_cmd.c: added ipkg_flag_cmd, do not upgrade package marked hold
-	* ipkg_install.c: do not remove obsolesced files if old_pkg is flagged noprune
-	* ipkg_remove.c: pkg->state_flag is a bitvector now
-	* pkg.c: pkg->state_flag is a bitvector now
-	* pkg.h: pkg->state_flag is a bitvector now
-2003-02-27  Jamey Hicks <jamey at handhelds.org> (another patch from pb)
-	* configure.ac: incremented version number to 0.99.47
-	* pkg.c: refix "uninstalled package has NULL tmp_unpack_dir"
-	* pkg_hash.c: 
-2003-02-27  Aman Gupta <oz at themastermind1.net> (another patch from pb_)
-	* configure.ac: incremented version number to 0.99.46
-	* pkg.c: fix "uninstalled package has NULL tmp_unpack_dir"
-2003-02-24  Jamey Hicks <jamey at handhelds.org> (per patch from Philip Blundell <pb at handhelds.org>)
-	* configure.ac: incremented version to 0.99.45
-	* file_util.c: include space for null in line_size
-	* ipkg_cmd.c: sigint handler while configuring packages
-	* ipkg_install.c: state_status != SS_INSTALLED and != SS_UNPACKED
-	* ipkg_remove.c: missing i++
-	* pkg.c: do not run scripts in offline_root mode
-	* pkg_depends.c: every package provides itself
-	* pkg_hash.c: better handling of packges provided by multiple providers
-2003-02-24  Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: incremented version number to 0.99.44
-	* args.c: added doc for -force-overwrite
-2002-11-26  Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: incremented version number to 0.99.43
-	* ipkg_install.c: completely skip the space check when -force_space asserted
-2002-11-23  Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: incremented version number to 0.99.42
-	* args.c: missed one spot checking for -force_space or -force-space    
-2002-11-23  Jamey Hicks <jamey at handhelds.org>
-	* configure.ac: incremented version number to 0.99.41
-	* ipkg_install.c: added -force_space option to override out of space check
-2002-11-23  Aman Gupta  <oz at themastermind1.net>
-	* configure.ac: incremented version number to 0.99.40
-	* ipkg_configure.c: updated to match new text output format
-	* ipkg_install.c: updated to new text output format
-			  fixed problems where ipks installed from file or
-			  http were being installed over newer ipks of the
-			  same name
-	* ipkg_remove.c: updated to new text output format
-			 made ipkg remove do what ipkg purge originally did,
-			 by having it remove conffiles, and status entries for
-			 ipks that are removed. ipkg_purge now calls
-			 ipkg_remove
-2002-11-22  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.39
-        * applied patches from Aman Gupta for better handling of dests
-2002-11-??  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.38
-2002-11-07  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.37
-	* hash_table.[ch]: moved internals of hash_tables out of pkg_hash.c
-	* pkg_hash.c: moved internals of hash_tables out of pkg_hash.c
-2002-10-29  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.37
-	* ipkg_cmd.c: ipkg_upgrade_cmd now installs uninstalled packages
-  	              instead of getting a segv 
-2002-10-29  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.36
-	* changed verbose_get to verbose_wget as documented
-2002-08-08  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.34
-	* ipkg_cmd.c: fixed problem stringifying HOST_CPU
-	* Makefile.am: helped fix problem stringifying HOST_CPU
-2002-08-08  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.33
-	* ipkg_cmd.c, args.c: added print-architecture and print-installation-architecture commands
-	* Makefile.am: added defines for HOST_CPU and BUILD_CPU to CFLAGS and package: target
-2002-08-08  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.32
-	* pkg.c: removed chroot breakage 
-2002-08-07  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.31
-	* other: applied multiple providers patch from philip blundell
-	* ipkg_cmd.c: implemented compare_versions cmd
-2002-07-25  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.30
-	* ipkg_conf.c: added offline_root_pre_script_cmd and offline_root_post_script_cmd
-	* pkg.c: execute scripts in chroot'ed environment running
-	pre_script_cmd and post_script_cmd before and after the pkg script. 
-2002-07-24  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.29
-	* pkg.c: fixed a segv when printing Replaces field
-2002-07-24  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.28
-	* ipkg_cmd.c: merged functionality from ipkg_install_cmd into
-	ipkg_upgrade_cmd with an eye towards unifying these two commands. 
-	* ipkg_install.c: installing a package that replaces other
-	packages removes them first.  (Upgrade does not do replacements automatically).
-	* ipkg_remove.c: ipkg_remove_pkg will remove a package with
-	installed dependents if state_flag == SF_REPLACE.
-2002-07-24  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.27
-2002-07-23  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.26
-	* renamed pkg_vec_init/pkg_vec_deinit to pkg_vec_alloc/pkg_vec_free
-	* started implementation of Replaces
-2002-07-22  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.25
-	* many cleanups trying to regain stability
-2002-07-22  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.24
-	* various files: trying to stomp a segv in conflicts checking.  
-2002-07-17  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.23
-	* ipkg_remove.c: do not do recursive removal if force-depends is
-	  specified
-	* other-files: other cleanups to reduce code clutter
-2002-07-16  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.22
-	* user.[ch]: moved user interaction procedure here
-	* args.[ch], ipkg_conf.[ch]: added force_removal_of_dependent_packages
-	* pkg.h: added state_status to abstract_pkg_t
-	* ipkg_remove.c: If package has installed dependents, then only
-	remove if force_removal_of_dependent_packages is asserted in
-	ipkg.conf or on command line.  Will add user interaction option later.
-2002-07-16  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.21 after
-	applying dependent removal and conflicts patch.
-	
-2002-07-14  Jamey Hicks <jamey.hicks at hp.com>
-	
-	* configure.ac: incremented version number to 0.99.20
-	* ipkg_download.c: removed useless -N flag from wget 
-	* update-alternatives: 'head -1' -> 'head -n 1', no sort -k 2 for busybox
-	
-2002-07-15  Karthikeyan K  <karthik at innvo.com>
-	
-	* ipkg_remove.c (ipkg_remove_dependant_pkgs): removed setting the 
-	dependencies_checked variable in the while loop b4 actually checking
-	the dependencies of that package.
-	* ipkg_cmd.c (ipkg_multiple_files_scan): added check for ".ipk" and
-	".deb" extension, so that no caching is attempted on  arguments that
-	are not local files
-	* pkg_depends.c (pkg_hash_fetch_conflicts): while returning NULL,
-	casted to (pkg_vec_t *) to compile without warnings
-
-2002-07-12  Abhaya Shenoy  <abhaya at innvo.com>
-	
-	* pkg_depends.c (pkg_hash_fetch_conflicts): use new abstract_pkg_vec
-	structure in checking provided_by
-
-2002-07-07  Jamey Hicks <jamey.hicks at hp.com>
-	
-	* configure.ac: incremented version number to 0.99.18
-	* fixed a segv due to type error in provides support
-	
-2002-07-07  Jamey Hicks <jamey.hicks at hp.com>
-	
-	* configure.ac: incremented version number to 0.99.17
-	* updated provides support so that installed provider is preferred to
-	  uninstalled provider
-
-2002-07-05  Abhaya Shenoy  <abhaya at innvo.com>
-	
-	* pkg_depends.c (pkg_hash_fetch_conflicts): check for conflicts
-	found before returning
-
-2002-07-04  Abhaya Shenoy  <abhaya at innvo.com>
-	* ipkg_install.c (check_conflicts_for): new function to call
-	pkg_hash_fetch_conflicts and print offending packages
-	(ipkg_install_pkg): added call to check_conflicts_for
-	* pkg.c (pkg_merge): provides from oldpkg should be given
-	priority
-	(pkg_init): init of conflicts, conflicts_count fields
-	* pkg.h (struct pkg): added fields conflicts_str, conflicts,
-	conflicts_count
-	* pkg_depends.c (pkg_hash_fetch_conflicts): new function to check
-	for conflicts
-	(buildConflicts): new function to set up the conflicts in the pkg
-	struct
-	* pkg_depends.h: added new type CONFLICTS to depend_type enum
-	* pkg_hash.c (hash_insert_pkg): added call to buildConflicts
-	* pkg_parse.c (pkg_parse_raw): added parsing of Conflicts
-
-2002-07-04  Karthikeyan K  <karthik at innvo.com>
-	
-	* ipkg_cmd.c (ipkg_multiple_files_scan): new function to handle installation
-	of already downloaded files
-	(ipkg_install_cmd): added call to ipkg_multiple_files_scan
-	(ipkg_remove_cmd): added call to possible_broken_removal_of_packages
-	* ipkg_install.c (ipkg_install_pkg): added check to remove redundant upgrade
-	when a package to be installed is already installed as a dependancy of
-	another
-	* ipkg_remove.c (possible_broken_removal_of_packages): new fnuction 
-	to check that all packages can be removed, before actually starting to
-	remove them
-	(ipkg_remove_dependant_pkgs): new function to remove dependant packages
-	(ipkg_remove_pkg): added call to ipkg_remove_dependant_pkgs
-	* pkg.c (abstract_pkg_init): initialized dependencies_checked
-	* pkg_hash.c (pkg_hash_dump): added more information to hash dump
-	
-2002-07-03  Jamey Hicks <jamey.hicks at hp.com>
-	
-	* configure.ac: incremented version number to 0.99.16
-	* ipkg_install.c: defensive programming in case pkg contains no Size: clause
-	
-2002-07-02  Jamey Hicks <jamey.hicks at hp.com>
-	
-	* configure.ac: incremented version number to 0.99.15
-	* pkg_depends.c: check for provided_by when fetching unsatisfied dependencies
-	
-2002-07-02  Jamey Hicks <jamey.hicks at hp.com>
-	* configure.ac: incremented version number to 0.99.14
-	* pkg_hash.c: if abstract pkg is provided_by, then return pkg vec
-	  of first package that provides it.
-		
-2002-06-17  Jamey Hicks	<jamey.hicks at hp.com>
-	
-	* configure.ac: incremented version number to 0.99.12
-	* args.h, ipkg_conf.h, ipkg_install.c: Added force_overwrite
-	option.  When this is asserted, ipkg will overwrite files that
-	have no owner or that belong to other packages.
-	* ipkg_conf.c, ipkg_dest.c: Update status file atomically, keeping
-	old copy of status file if cannot update new status file.  Applied
-	patch from Jukka Santala for this fix.
-	
-2002-03-16  Carl Worth  <cworth at east.isi.edu>
-
-	* configure.ac: Incremented version number to 0.99.9-1.
-
-	* RELEASE_NOTES: Added release notes for 0.99.9-1.
-	
-2002-03-15  Carl Worth  <cworth at east.isi.edu>
-
-	* configure.ac: Incremented version number to 0.99.9.
-
-	* RELEASE_NOTES: Added release notes for 0.99.9.
-
-	* Makefile.am (bin_PROGRAMS): Install update-alternatives as well.
-
-	* familiar/rules (binary-arch): Mv all of /bin to /usr/bin
-
-	* configure.ac: Incremented version number to 0.99.8.
-
-	* RELEASE_NOTES: Added release notes for 0.99.8.
-
-	* familiar/rules (binary-arch): Fixed to use "make install-strip"
-	rather than "make install" and a strip command.
-
-	* ipkg_cmd.c (ipkg_install_cmd): Moved an error message up from
-	ipkg_install_by_name, (eventually all error messages should come
-	up out of what will become libipkg, (pkg.c, ipkg_install.c, etc.)
-	and into ipkg_cmd.c and friends).
-	(ipkg_upgrade_pkg): Pushed downgrade check down into
-	ipkg_install_by_name so that "ipkg install foo" will do the
-	downgrade check.
-
-	* ipkg.h: Rename some ipkg_error_t error codes to be more
-	consistent.
-
-	* ipkg_install.c (resolve_conffiles): Added missing removal of
-	backed-up modified conffiles, (which led to bizarre, bogus
-	conffile prompting the next time the package was upgraded).
-	(user_prefers_old_conffile): Fixed reversed arguments to diff in
-	interactive conffiles prompting.
-	(ipkg_install_by_name): Fixed "ipkg install foo" to never
-	downgrade foo, (just like "ipkg upgrade foo").
-
-	* familiar/rules: Added installation of
-	/usr/share/doc/ipkg/copyright file. Fixed so that ipkg.conf goes
-	to /etc, not /usr/etc, (but still keep binary in /usr/bin not
-	/bin). Changed name of installed binary from ipkg-unstable to
-	ipkg.
-
-	* familiar/control.in (Package): Changed package name from
-	ipkg-unstable to ipkg.
-
-	* pkg_parse.c (parseVersion): Fixed to ignore whitespace at
-	beginning of version string.
-	(pkg_parse_raw): Fixed segfault if a package record list ends with
-	a package paragraph without a final blank line.
-
-	* ipkg_install.c (check_data_file_clashes): Improved wording of
-	file clash error message.
-
-	* ipkg_download.c (ipkg_download_pkg): Fixed segfault if package
-	has no src, (occurs if package had benn installed locally, then
-	was removed (but not purged), then tried to reinstall eithout it
-	existing in any /usr/lib/ipkg/lists/* file).
-
-	* etc/ipkg.conf: Added a default ipkg.conf to the distribution.
-
-2002-03-13  Carl Worth  <cworth at east.isi.edu>
-
-	* configure.ac: Incremented version to 0.99.7.
-
-	* RELEASE_NOTES: Added release notes for 0.99.7.
-
-	* pkg.c (pkg_run_script): Added support to export
-	IPKG_OFFLINE_ROOT. This is really a nasty hack as it means scripts
-	need to be modified to check IPKG_OFFLINE_ROOT. I'd really prefer
-	coming up with a good, reliable chroot system. But for now this
-	will let update-alternatives work, (which already does examine
-	IPKG_OFFLINE_ROOT).
-	(pkg_run_script): Added missing brace.
-
-	* ipkg_conf.c (ipkg_conf_init): Reworked significantly to properly
-	set up the pkg_dest_list stuff to account for offline_root.
-
-	* args.c (args_parse): Added support for -force_defaults in
-	addition to -force-defaults, etc. as I kept mistyping these
-	somehow.
-
-2002-03-12  Carl Worth  <cworth at east.isi.edu>
-
-	* configure.ac: Incremented version to 0.99.6.
-
-	* RELEASE_NOTES: Added release notes for 0.99.6.
-
-	* ipkg_download.c (ipkg_download): Fixed bug in handling of
-	"file://" URLs.
-
-	* ipkg.c (main): Fixed to abort if ipkg_conf_init fails.
-
-	* ipkg_conf.c (ipkg_conf_init): Fixed to complain if given an
-	unknown dest.
-
-	* pkg.c (pkg_print_field): Fixed several fields to not print if
-	NULL, (Architecture. Maintainer, Size, Filename, Description)
-
-	* args.c (args_parse): Fixed bug that was always setting
-	force_removal_of_essentail_packages (yikes!).
-
-	* configure.ac: Incremented version to 0.99.5.
-
-	* RELEASE_NOTES: Added release notes for 0.99.5.
-
-	* familiar/rules (binary-arch): Added strip back in in preparation
-	of non-unstable release of ipkg.
-
-	* str_util.c (str_starts_with): Added convenience function.
-
-	* pkg_extract.c (pkg_extract_data_file_names_to_file): Fixed
-	filenames in *.list files to be compatible with dpkg and the old
-	ipkg, (no prefix of "." for example).
-
-	* pkg.c (pkg_run_script): Added export of PKG_ROOT for the benefit
-	of maintainer scripts.
-
-	* ipkg_remove.c (ipkg_remove_pkg): Complain and abort if user
-	attempts to remove an essential package, (also inform them of the
-	force option if they insist).
-
-	* ipkg_install.c (ipkg_install_pkg): Added message about whether
-	installing or upgrading.
-
-	* ipkg_download.c (ipkg_download): Added support for "file://"
-	URLs, (untested).
-	(ipkg_download): Added support for wget proxy options.
-
-	* ipkg_conf.c (ipkg_conf_init): Added proxy support to ipkg_conf,
-	(http_proxy, ftp_proxy, no_proxy, proxy_user, and proxy_passwd).
-
-	* ipkg_cmd.c (ipkg_upgrade_pkg): Moved Upgrading message from
-	ipkg_upgrade_cmd to ipkg_install_pkg.
-
-	* args.c (args_parse): Added new option
-	-force-removal-of-essential-packages, (which is intentionally
-	painful to type and not listed in usage. It should not be used
-	often).
-
-2002-03-11  Carl Worth  <cworth at east.isi.edu>
-
-	* configure.ac: Incremented version to 0.99.3.
-
-	* RELEASE_NOTES: Added release notes for 0.99.3.
-
-	* pkg_depends.c (pkg_hash_fetch_unsatisfied_dependencies): Fixed
-	to avoid infinite loop in the case of a circular dependency.
-
-	* configure.ac: Incremented version to 0.99.2.
-
-	* RELEASE_NOTES: Added release notes for 0.99.2.
-
-	* familiar/rules: Commented out strip, (temporary until this beast
-	is deemed more stable).
-
-	* xsystem.c (xsystem): Cleaned up error message, (missing
-	newline).
-
-	* pkg.c (pkg_merge): Made pkg_merge a NOP if oldpkg == newpkg.
-	(pkg_print_field): Don't print MD5sum field if NULL.
-
-	* ipkg_install.c (satisfy_dependencies_for): Now returns error
-	status if one or more of the dependencies fail to install cleanly.
-	(unpack_pkg_control_files): Fixed to not tack on a bunch of
-	NULL-valued conffiles entries if non-NULL conffiles already
-	exist. This fixed the errant prompting for unmodified conffiles
-	during -force-reinstall.
-	(unpack_pkg_control_files): Cleaned up conffile filenames to not
-	have ugly things like "///" inside them.
-
-	* ipkg_download.c (ipkg_download): Cleaned up error message.
-	(ipkg_download): Now uses new file_move function.
-	(ipkg_download_pkg): Created new function, (from old code in ipkg_install).
-
-	* ipkg_cmd.c (ipkg_download_cmd): Added new "ipkg download"
-	command.
-
-	* file_util.c (file_move): Created file_move, (from code that had
-	been in ipkg_download).
-	(file_copy): Added error message on failure.
-
-	* conffile.c (conffile_has_been_modified): Eliminated crash if
-	conffile_has_been_modified is called with conffile->value == NULL.
-
-2002-03-09  Carl Worth  <cworth at east.isi.edu>
-
-	* RELEASE_NOTES: Added release notes for 0.99.1
-
-	* configure.ac: Incremented version to 0.99.1
-
-	* pkg_hash.c (pkg_hash_pkg_owning_file): Fixed to actually return
-	NULL if no package owns a file.
-
-	* pkg.c (pkg_get_installed_files): Added installed_files_ref_cnt
-	to pkg_t to prevent pkg->installed_files from being freed from an
-	inner loop while still being used by an outer loop, (which was
-	happening).
-
-	* pkg_hash.c (pkg_hash_pkg_owning_file): Moved this function in
-	from pkg_dest.c. Also, updated it to use pkg_get_installed rather
-	than mucking around inside /usr/lib/ipkg and globbing for *.list
-	files.
-	(pkg_hash_fetch_best_installation_candidate): Fixed to only return
-	a package that actually could be installed, (ie. it must have
-	either a local_filename or a non-NULL src from which it could be
-	downloaded). This prevents a segfault during "ipkg upgrade".
-
-	* pkg.c (pkg_get_installed_files): Fixed to not do strange things
-	to filenames such as: "//./bin/sh"
-
-	* ipkg_cmd.c (ipkg_files_cmd): Added pkg_free_installed_files to
-	conserve a bit of memory.
-	(ipkg_search_cmd): Updated to use pkg_get_installed rather than
-	mucking around inside /usr/lib/ipkg and globbing for *.list files.
-
-	* pkg.c (pkg_free_installed_files): Added this function to free up
-	memory from pkg_get_installed_files.
-
-	* ipkg_conf.c (ipkg_conf_set_option): Added force_reinstall option
-	to allow reinstallation of an installed package.
-
-	* args.c (args_parse): Added -force-reinstall option to enable
-	reinstallation of an installed package.
-
-	* busybox-0.60.2/ar.c (ar_main): Updated unarchive call to track
-	prototype change.
-
-	* busybox-0.60.2/libbb/unarchive.c (free_header_ar): Added
-	function to plug memory leak.
-
-	* ipkg_install.c (check_data_file_clashes): Fixed crash if no
-	package can be found owning the pre-existing file.
-
-	* pkg_dest.c (pkg_dest_deinit): Fixed bug that pkg_dest was
-	holding on to freed data rather than making a local copy.
-
-	* pkg_depends.c (freeDepends): Fixed crash when pkg->depends is NULL.
-
-	* RELEASE_NOTES: Added release notes for 0.98.0 and 0.99.0.
-
-	* busybox-0.60.2/libbb/unarchive.c (extract_archive): Fixed
-	bug. Always alloc memory for full_name so we don't free data that
-	we shouldn't.
-	(unarchive): Updated to accept a free_headers function pointer as
-	a counterpart to get_headers, to eliminate memory leaks.
-	(free_header_tar): Implemented cleanup function as counterpart to
-	get_header_tar, to eliminate memory leaks.
-	(deb_extract): Added several calls to free_header_tar to eliminate
-	memory leaks.
-
-	* str_util.c (str_dup_safe): Added convenience function. Like
-	strdup, but safe to use on a NULL pointer.
-
-	* pkg_vec.c (pkg_vec_insert): Updated to use new pkg.c:pkg_merge
-	rather than marry_two_packages. With this change the free(pkg) is
-	now here rather than one level deeper. Eventually, I want to get
-	this free(pkg) up and out of pkg_hash_insert.
-
-	* pkg_parse.c (parseDependsString): Fixed bug walking off the end
-	of the raw buffer looking for a character that isspace().
-	(parseConffiles): Fixed big bug parsing Conffiles field where all
-	conffiles appear on the same line.
-
-	* pkg_hash.c (pkg_hash_add_from_file): Plugged memory leak of data
-	allocated deep down in read_raw_pkgs_from_file.
-
-	* pkg_depends.c (pkg_hash_fetch_unsatisfied_dependencies): Plugged
-	memory leak, (missing pkg_vec_deinit).
-	(freeDepends): Added this function as the counterpart to
-	buildDepends. Getting closer to chasing down all memory leaks.
-	(depend_deinit): Added this function as the counterpart to
-	depend_init. Getting closer to chasing down all memory leaks.
-	(parseDepends): plugged memory leak of pkg_name.
-
-	* pkg.c (pkg_deinit): Added pkg_deinit to take care of freeing any
-	memory owned by a pkg_t.
-	(pkg_init_from_file): This function was 100% broken, (missing
-	rewind).
-	(pkg_merge): Moved pkg_merge here from
-	pkg_vec.c:marry_two_packages. Started work to make it
-	non-destructive, (not finished).
-	(pkg_print_info): Added Status and Essential fields to
-	pkg_print_info.
-	(pkg_print_status): Fixed pkg_print_status to work whether or not
-	the package is installed.
-
-	* ipkg_utils.c (read_raw_pkgs_from_file): Moved fclose out of
-	read_raw_pkgs_from_stream and into this function where it belongs,
-	(since the fopen occurs here).
-	(trim_alloc): Fixed trim to not free data passed in. Changed the
-	name to make it obvious that it is allocating memory.
-
-	* ipkg_install.c (ipkg_install_from_file): Fixed to be more robust
-	to the fact that hash_insert_pkg sometimes frees the data that I
-	pass into it (!).
-	(satisfy_dependencies_for): Cosmetic change to messages.
-	(satisfy_dependencies_for): Now sets the dest on to-be-installed
-	packages, so that the state_want flag can be written to a status
-	file if necessary.
-	(satisfy_dependencies_for): Added pkg_vec_deinit to plug memory
-	leak.
-	(ipkg_install_pkg): Added "run ipkg update?" hint to error
-	message.
-	(backup_modified_conffiles): Made more robust to the case that a
-	conffile has disappeared.
-	(install_maintainer_scripts): Fixed bug that was installing
-	maintainer scripts as libFoopostinst rather than
-	libFoo.postinst. This was preventing postinst scripts from being
-	executed.
-	(cleanup_temporary_files): Added missing closedir to plug a memory
-	leak.
-
-	* ipkg_download.c (ipkg_download): Cosmetic change to error
-	messages.
-
-	* ipkg_conf.c (ipkg_conf_parse_file): Plugged some small memory
-	leaks.
-	(ipkg_conf_set_option): Changed configuration options from
-	force-depends, force-defaults to force_depdends, force_defaults to
-	be compatible with old ipkg.conf files.
-	(ipkg_conf_set_option): Fixed bug in parsing options.
-	(ipkg_conf_write_status_files): Fixed to list all interesting
-	packages, (any with non-default state), in status file rather than
-	just installed files.
-	(ipkg_conf_write_status_files): Plugged a memory leak.
-
-	* ipkg_cmd.c (ipkg_status_cmd): Changed "ipkg status" to use
-	pkg_print_info so it is much more verbose, (includes fields such
-	as Maintainer, etc. that are merged in from the lists files).
-
-	* ipkg.h (IPKG_DEBUG_NO_TMP_CLEANUP): Added compile-time option to
-	preserve temporary files for easier debugging.
-
-	* file_util.c (file_md5sum_alloc): cosmetic changes to variable
-	names.
-	
-	* ipkg_conf.c (ipkg_conf_init): Added support for offline_root
-	configuration file option.
-
-	* args.c (args_init): Added support for -o, -offline,
-	-offline-root command-line arguments. (Although they don't really
-	have any effect yet).
-
-	* ipkg_install.c (ipkg_install_pkg): Changed back to marking
-	package as installed before postinst, (the pkg_run_script wanted
-	to find the scripts in /usr/lib/ipkg/info). Actually, it could
-	probably find the script in either place at this point so maybe it
-	doesn't really matter.
-
-2002-03-07  Carl Worth  <cworth at east.isi.edu>
-
-	* ipkg_install.c (ipkg_install_pkg): Changed to only mark package
-	as installed after running ipkg_configure, (to run the postinst
-	script).
-
-	* RELEASED ipkg-unstable 0.99.0
-
-	* Updated all instances of "XXX" in the code to indicate one of
-	the following categories:
-	XXX: BUG: This is a bug that needs to be fixed.
-	XXX: QUESTION: Implementation approach is uncertain here.
-	XXX: CLEANUP: Suggestion on how the code could be cleaned up.
-	XXX: FEATURE: Comment describes a useful feature request.
-	
-	* pkg.c (pkg_print_status): Added the Depends field to package
-	paragraphs in the status file, ("ipkg remove" will need this).
-
-	* ipkg_install.c (satisfy_dependencies_for): Fixed "ipkg install"
-	to not complain several times about "Package foo already
-	installed" when doing large recursive installs.
-	(ipkg_install_pkg): "ipkg install foo" for an installed package
-	will now check and install any missing dependencies before exiting
-	with "Package foo is alrady installed."
-
-2002-03-06  Carl Worth  <cworth at east.isi.edu>
-
-	* pkg_dest.c (pkg_dest_pkg_owning_file_alloc): Moved this function
-	here from ipkg_install.c. Also plugged a memory leak in it with
-	globfree.
-
-	* pkg.c (pkg_remove_installed_files_list): Fixed bug that
-	prevented package.list file from ever being removed during "ipkg
-	remove".
-
-	* ipkg_remove.c (remove_data_files_and_list): Fixed noisy and
-	spurious warnings about non-empty directories. "ipkg remove"
-	should now only say anything if a directory that was solely
-	provided by that package is non-empty.
-
-	* ipkg_cmd.c (ipkg_install_pending_cmd): Plugged memory leak with
-	globfree.
-
-	* ipkg_install.c: *Many* fixes to enable "ipkg upgrade" to more or
-	less work. Primarily fixing file clash identification and conffile
-	handling/resolution. "ipkg upgrade" has now worked correctly on
-	several test cases!
-
-	* ipkg_install.c (unpack_pkg_control_files): Now initializes
-	conffiles list from the contents of conffiles control file,
-	(leaves md5sum calculation until the actual conffiles are
-	extracted later).
-	(ipkg_install_pkg): Separated backup_modified_conffiles and
-	check_data_file_clashes into separate functions.
-	(preinst_configure): Simplified this function pushing its old
-	logic into pkg.c:pkg_run_script.
-	(backup_modified_conffiles): Added backup of any conffiles that
-	are new as of this upgrade.
-	(check_data_file_clashes): First real implementation of
-	check_data_file_clashes.
-	(resolve_conffiles): First real implementation of
-	resolve_conffiles.
-	(backup_make_backup): Added this and a few other functions to
-	abstract backup creation/removal.
-	(find_pkg_owning_file): Added this function.
-	
-	* pkg_extract.c (pkg_extract_data_files_to_dir): Fixed args to
-	deb_extract so that existing files will be overwritten, (and any
-	other error messages will no longer be suppressed).
-
-	* pkg.c (pkg_print_status): Added Conffiles field to
-	pkg_print_status.
-	(pkg_print_field): Fixed crash when printing NULL Conffiles
-	values.
-	(pkg_get_conffile): Fixed crash if pkg_get_conffile called with a
-	NULL pkg.
-	(pkg_run_script): Made pkg_run_script smart enough to run scripts
-	for uninstalled packages, (from
-	<pkg_tmp_unpack_dir>/<script_name>), as well as for isntalled
-	packages, (from <dest_info_dir>/<pkg_name>.<script_name>
-
-	* str_util.c (str_tolower): Added convenience function.
-	(str_toupper): Added convenience function.
-
-	* nv_pair.c (nv_pair_init): Fixed crash from calling nv_pair_init
-	with NULL value.
-
-	* pkg.c (pkg_init_from_file): Fixed bug -- forgot to close file.
-
-	* file_util.c (file_md5sum_alloc): Convenience wrapper around
-	md5_stream as ripped out of busybox. This function takes care of
-	file open/close and does the bin2hex conversion of the md5sum.
-
-	* conffile.c (conffile_has_been_modified): Implemented this
-	function for real now that we have md5sum capability.
-
-	* md5.c (md5_stream): Sucked in md5sum calculation code from
-	busybox, (it wasn't part of libbb, so I just copied the files
-	straight in and ripped out uninteresting functions such as
-	md5sum_main, etc.)
-
-2002-03-05  Carl Worth  <cworth at east.isi.edu>
-
-	* pkg.c (pkg_print_field): Added support for printing Conffiles
-	field.
-
-	* ipkg_install.c (remove_obsolesced_files): With the fixed
-	pkg_get_installed_files_list from below, this function now seems
-	to work!
-	(ipkg_install_pkg): Fixed to mark old package as uninstalled after
-	upgrading.
-
-	* pkg.c (pkg_get_installed_files_list): Fixed so that it's
-	possible to get an "installed_files" list even from an uninstalled
-	package, (it pulls the list of data files straight out of the
-	package).
-
-	* ipkg_cmd.c (ipkg_upgrade_cmd): Fixed ipkg_upgrade to not choke
-	if asked to upgrade an un-installed package.
-	(ipkg_upgrade_pkg): Fixed printing of version numbers.
-
-	* file_util.c (file_mkdir_hier): Abstracted call to libbb
-	make_directory into new file_mkdir_hier. At this point, the only
-	calls into libbb are isolated in file_util and pkg_extract. This
-	will make it easier if we ever decide to directly incorporate that
-	code or rewrite it.
-
-	* pkg_extract.c (pkg_extract_data_files_to_dir): Abstracted all
-	calls to deb_extract in several new pkg_extract functions.
-
-2002-03-04  Carl Worth  <cworth at east.isi.edu>
-
-	* ipkg_conf.c (ipkg_conf_init): Added support to ipkg_conf to
-	pickup command-line arguments for "force-defaults" and
-	"force-depends". Things set on the command-line should take
-	precedence over things found in the configuration file.
-
-	* ipkg_cmd.c (ipkg_search_cmd): Fixed formatting of "ipkg search"
-	output.
-
-	* pkg_depends.c (pkg_hash_fetch_unsatisfied_dependencies):
-	Re-added fix to set *unresolved to NULL if depends is NULL.
-
-	* xregex.c (xregexec): Removed useless error messages from NOMATCH
-	calls to regexec.
-
-	* ipkg_install.c (satisfy_dependencies_for): Added support for new
-	"unresolved" argument in
-	pkg_hash_fetch_unsatisfied_dependencies. Cleaned up warning/error
-	messages.
-
-	* ipkg_cmd.c (ipkg_search_cmd): Implemented first-cut of "ipkg search".
-
-	* pkg_depends.c (pkg_hash_fetch_unsatisfied_dependencies): Fixed
-	to set *unresolved to NULL if depends is NULL.
-
-2002-03-01  Carl Worth  <cworth at east.isi.edu>
-
-	* RELEASED ipkg-unstable 0.98.0
-
-	* ipkg_configure.c (ipkg_configure): Added flushing of stdout,
-	(here and in a few other modules).
-
-	* file_util.c (file_copy): Implemented this function here as one
-	step toward isolating the calls into libbb functions. Updated old
-	copy_file calls to file_copy in both ipkg_download.c and
-	ipkg_install.c.
-
-	* ipkg_install.c, ipkg_remove.c: Demoted several "XXX" comments to
-	DPKG_INCOMPATIBILITY as I really don't intend on addressing them
-	any time soon, (if ever).
-
-	* ipkg_cmd.c (ipkg_files_cmd): Fixed "ipkg files" from crashing on
-	uninstalled packages.
-
-	* familiar/rules: Added support for easy building of an
-	ipkg.ipk. The version number and the architecture are
-	automatically sucked in correctly from autoconf magic, (even when
-	cross-compiling). Maybe autoconf will start paying off with
-	benefits rather than pain, (finally!).
-
-	* configure.ac: Removed MEMCMP and STAT checks which were breaking
-	cross-compilation.
-
-	* ipkg_cmd.c (ipkg_upgrade_pkg): BIG bugfix: Package version
-	comparison was sign-reversed, (hence it would never upgrade).
-
-2002-02-28  Carl Worth  <cworth at east.isi.edu>
-
-	* ipkg_download.c (ipkg_download): Changed from
-	system("/bin/cp",...) to copy_file(...)
-
-	* replace/strndup.c: Implemented an (untested) replacement for
-	strndup.
-
-	* configure.ac: Added AC_CANONICAL_HOST to automatically set the
-	correct architecture type in the ipkg control file.
-
-	* configure.ac: Changed version number to 0.98.0 in preparation
-	for alpha release.
-
-	* familiar/rules: Added support for easy building of an ipkg.ipk.
-
-2002-02-27  Carl Worth  <cworth at east.isi.edu>
-
-	* ipkg_install.c (ipkg_install_pkg): Fixed to abort on failed
-	download.
-
-	* pkg.c (pkg_run_script): Fixed bug that was preventing any
-	package maintainer scripts from running, (hence, they run now so
-	running non-native offline no longer works until I figure out the
-	chroot plans).
-
-	* TODO: Added rough outline of remaining features with a release
-	schedule.
-
-	* pkg_parse.c (pkg_parse_raw): Added parsing of "MD5Sum" in
-	addition to "MD5sum" to accomodate bug in old ipkg.
-
-	* void_list.c (void_list_remove): Added new remove function, (also
-	adjusts a forward iterator). Required new list->pre_head member
-	which was added to all sub-list types.
-
-	* pkg.c (pkg_init): Changed pkg->conffiles to be of the new
-	conffile_list_t datatype.
-	(pkg_remove_installed_files_list): Pulled this function into
-	pkg.c, (from ipkg_remove.c), so the mallocs and frees would be in
-	the same C file.
-	(pkg_get_conffile): Added this convenience function.
-
-	* ipkg_remove.c: Fixed several bugs. ipkg_remove now actually
-	works for simple packages!
-
-	* ipkg_install.c (ipkg_install_pkg): Don't re-install if a package
-	is already installed.
-	(ipkg_install_pkg): Fixed major bug that all of ipkg_install's
-	work was always being unwound even when successful.
-
-	* ipkg_cmd.c (ipkg_files_cmd): Fixed to use
-	pkg_get_installed_files_list rather than a private implementation
-	that sifted through the file lists on disk.
-
-	* str_util.c (str_ends_with): Added this convenient function.
-	(str_chomp): Another convenience.
-
-	* ipkg_conf.c: Moved chomp to str_util.c (str_chomp), since
-	someone else wanted it too.
-
-2002-02-26  Carl Worth  <cworth at east.isi.edu>
-
-	* pkg_parse.c (pkg_parse_raw): Added XXX requesting parsing of
-	Conffiles: field along with a hint about how to store the data.
-
-	* conffile_list.c:  Added a little wrapper around nv_pair_list
-
-	* conffile.c: Added a little wrapper around nv_pair
-
-	* str_util.c (str_ends_with): New convenience function.
-
-	* str_list.c (str_list_remove): Plugged in remove function.
-
-	* void_list.c (void_list_remove): Added remove function, (handles
-	updating of forward iterator).
-
-	* pkg.c (pkg_run_script): Changed to return return value of
-	script.
-
-	* ipkg_remove.c: Fleshed out initial version of all ipkg_remove.c
-	functions.
-
-	* ipkg_configure.c (ipkg_configure): Added check on return value
-	of pkg_run script. Added comments about dpkg compliance.
-
-	* ipkg_cmd.c (ipkg_purge_cmd): Added ipkg_purge_cmd
-
-2002-02-20  Carl Worth  <cworth at east.isi.edu>
-
-	* Added USC copyright statements, (and Compaq stubs as necessary)
-
-	* ipkg_install.c: At this point "ipkg install" on a simple
-	package, (no scripts and no dependencies), works just fine. It
-	might even do some of the script and dependency handling correctly
-	too, but I haven't tested that yet. "ipkg install libc6" is a nice
-	little test that should complete without any errors or
-	warnings. Follow that up with "ipkg status" to see that it worked.
-
-	* pkg.c (pkg_run_script): Added convenience method for running
-	package scripts.
-
-	* ipkg_install.c: Fixed several bugs:
-	(unpack_pkg_control_files): control files now extract to the
-	correct temporary directory.
-	(ipkg_install_pkg): pkg->state_want is now properly set to SW_INSTALL
-	(ipkg_install_pkg): status file now gets written after installation
-	(cleanup_temporary_files): All temporary files are cleaned up.
-
-	* ipkg_configure.c (ipkg_configure): Fleshed out a very simple
-	ipkg_configure, (simply runs "postinst configure"). Maybe it will
-	need to be smarter at some point. Moved unwritten conffiles stuff
-	back to ipkg_install.c.
-
-	* ipkg_conf.c (ipkg_conf_write_status_files): Moved this function
-	from ipkg_utils to ipkg_conf since it needs access to the
-	pkg_dest_list.
-
-	* pkg_vec.c (marry_two_packages): Added several missing fields,
-	(state_want, state_flag, filename, local_filename, tmp_unpack_dir,
-	md5sum, size, installed_size, priority, source, conffiles,
-	isntalled_files, essential)
-
-2002-02-19  Carl Worth  <cworth at east.isi.edu>
-
-	* ipkg_install.c: several little bug fixes. "ipkg install" will
-	now actually install files from a package! There are still some
-	bugs, (eg. postinst scripts are not called -- probably other
-	things as well). But, it's coming together now.
-
-	* pkg_dest.c (pkg_dest_init): now creates all necessary directories
-
-	* ipkg_download.c (ipkg_download): Fixed misleading parameter name.
-
-	* ipkg_conf.c (ipkg_conf_deinit): Now cleans up tmd_dir on deinit
-	ipkg.c: now calls ipkg_conf_deinit before exiting.
-	(ipkg_conf_add_nv): Fixed to set default_dest when parsing first
-	dest in ipkg.conf
-
-	* ipkg_cmd.c (ipkg_list_cmd): Fixed ugly bug in ipkg_list that led
-	to infinite loops, segfaults, string corruption, and other bizarre
-	behavior.
-
-	* Added many files as we are approaching the first functional ipkg
-	implementation in C:
-	file_util.c: convenience for testing if file_exists, reading files, etc.
-	ipkg_configure.c: mostly just a stub so far
-	ipkg_download.c: convenient function to download a file
-	nv_pair.c: data structure to hold a name-value pair
-	nv_pair_list.c: data structure to hold a list of nv_pair_t
-	pkg_dest.c: data structure for everything a pkg destination wants
-	pkg_dest_list.c: data structure to hold a list of pkg_dest_t
-	pkg_extract.c: convenience functions for package extraction,
-	(these function should encapsulate any libbb borrowings we perform
-	-- although some slipped into other files already)
-	pkg_src.c: everything you might need for a pkg src.
-	pkg_src_list.c: data structure to hold a list of pkg_src_t
-	str_list.c: data structure to hold a list of char *
-	void_list.c: generic linked-list data structure and functions
-	xsystem.c: wrapper around system() with error checking
-
-	* ipkg_remove.c: Just added some stubs. Nothing really works at
-	all yet.
-
-	* ipkg_install.c: Large rework of ipkg_install. It's now close to
-	actually being usable, (but it's not quite there yet). Revamped to
-	match dpkg install order more closely, (with all the stubs in case
-	we ever want to call all the scripts that dpkg does). Also updated
-	to use a more recent deb_extract from libbb.
-
-	* ipkg_extract_test.c (main): Added support for a third arg, (the
-	filename to extract to the buffer).
-
-	* ipkg_conf.c (ipkg_conf_init): Added several fields to
-	ipkg_conf_t: pkg_src_list, pkg_dest_list ,
-	restrict_to_default_dest, default_dest, tmp_dir, lists_dir,
-	pending_dir, force_depends, and pkg_hash. There's still a bit of
-	tension between options stored in the config file, (ipkg_conf_t),
-	and command-line arguments, (args_t).
-
-	* ipkg_cmd.c: First version that is approaching usability. The
-	following commands are more-or-less in place: "ipkg update", "ipkg
-	list", "ipkg info", "ipkg status". While the rest are in various
-	states of being partiallyy written or written but untested.
-	(ipkg_upgrade_cmd): Added support for restricting to a dest.  Many
-	other changes, largely involving plugging into the pkg_hash for
-	real for the first time, and adding multiple dest support.
-
-	* ipkg.c: Added support for setting the dest on the command-line.
-
-	* args.c: Added support for IPKG_CONF_DIR environment variable and
-	-f, -conf, and -conf-file options.
-
-	* configure.ac: Added lots of little bits suggested by autoscan.
-
-2002-02-18  Carl Worth  <cworth at east.isi.edu>
-
-	* pkg_parse.c (pkg_parse_raw): Added parsing, (kinda ugly), for
-	essential field.
-	* pkg.c (pkg_print_field): Added the essential flag.
-
-	* pkg_vec.c (pkg_vec_insert): Fixed to use pkg_compare_versions to
-	determine matching versions instead of a strcmp on the version
-	string.
-
-2002-02-15  Carl Worth  <cworth at east.isi.edu>
-
-	* pkg_parse.c (pkg_parse_raw): Updated to accept a pkg_src_t
-
-	* pkg.c (pkg_init): Added field to pkg_t: "pkg_src_t *src"
-
-	* pkg_hash.c (pkg_hash_add_from_file): Updated to accept a pkg_src_t
-
-	* pkg_parse.c (parseStatus): Modified to accept a pkg_t *
-	(parseVersion): Added this function
-	(pkg_parse_raw): Updated to accept a pkg_dest_t
-	(pkg_parse_raw): Reworked the parsing to use a pkg_t rather than a
-	slew of local variables.
-	(pkg_parse_raw): Added support for about a dozen new pkg_t fields
-
-	* pkg.h: Updated for all pkg.c changes.
-
-	* pkg.c (pkg_new): Added pkg_new for convenient alloc'ing of a pkg_t.
-	(pkg_init): Added several fields to pkg_t: dest, section,
-	suggests, filename, local_filename, tmp_unpack_dir, md5sum, size,
-	installed_size, priority, source, and conffiles.
-	(): Moved buildPkg this function to pkg_parse
-	(pkg_init_from_file): Added convenience function for filling a
-	pkg_t from an actual package file.
-	(pkg_print_info): Split print_pkg into both pkg_print_info and
-	pkg_print_status.
-	(pkg_print_field): Added pkg_print_field, (extremely ugly)
-	(): Moved parseversion to pkg_parse where it belongs
-	(pkg_version_str_alloc): Added, (complement of parse_version)
-
-	* pkg_depends.h: Added GPL blurb
-	(PKG_DEPENDS_H): Added multiple include protection
-
-	* pkg_depends.c: Moved non-static prototypes to header file.
-	Changed several locl-only functions to be static.
-	Added function prototypes for static functions.
-	(buildDepends): Removed unecessary cast of malloc return value.
-
-	* pkg_hash.h: Moved hash-related struct declarations to this file
-	Rename pkg_fetch* to have consistent pkg_hash_fetch prefix.
-	Added missing prototype for pkg_vec_fetch_by_name
-
-	* pkg_hash.c: (pkg_hash_add_from_file): Added support for setting
-	the pkg_dest
-	(pkg_hash_add_from_file): Moved buildDepends call to
-	hash_insert_pkg
-	(pkg_hash_fetch_installed_by_name_dest): Added this function to
-	support pkg_dest
-
-	* ipkg_utils.h: Added GPL blurb
-	(IPKG_UTILS_H): Added multiple include protection
-
-	* ipkg_utils.c:
-	(read_raw_pkgs_from_file): broke read_raw_pkgs into
-	read_raw_pkgs_from_file and read_raw-pkgs_from_stream
-	(ipkg_write_status_file): Fixed return value
-	(print_pkg_status): Moved this function to pkg.c:pkg_print_status
-	(line_is_blank): Fixed const char handling
-
-2002-02-08  Carl Worth  <cworth at east.isi.edu>
-
-	* pkg_parse.c: Fixed a bug in parsing the 3 state fields.
-
-2002-02-06  Carl Worth  <cworth at east.isi.edu>
-
-	* pkg.c: Expanded pkg_status field to the full 3 fields: state_want,
-	state_flag, and state_status.
-
-2001-12-11  Carl Worth  <cworth at east.isi.edu>
-
-	* ipkg_conf.c: Now parses /etc/ipkg.conf, (and doesn't do anything
-	with it).
-
-	* ipkg.c: Started work on ipkg main, (not much here yet).
-
-	* ipkg_cmd.h: Added a tiny thing to abstract top-level ipkg
-	commands, (not finished).
-
-	* Set up autoconf and friends

Copied: trunk/src/target/opkg/ChangeLog (from rev 3879, trunk/src/target/ipkg/ChangeLog)

Deleted: trunk/src/target/opkg/INSTALL
===================================================================
--- trunk/src/target/ipkg/INSTALL	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/INSTALL	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,196 +0,0 @@
-ipkg uses autoconf and friends for configuration. The familiar steps of:
-
-	./configure
-	make
-
-should be sufficient, (you may need an initial ./autoconfigure.sh), if
-you don't have a generated configure script, (ie. you're compiling a
-version out of CVS).
-
-The remainder of this document is the standard INSTALL document
-provided by autoconf.
-
--Carl <cworth at handhelds.org>
-
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.

Copied: trunk/src/target/opkg/INSTALL (from rev 3879, trunk/src/target/ipkg/INSTALL)

Deleted: trunk/src/target/opkg/Makefile.am
===================================================================
--- trunk/src/target/ipkg/Makefile.am	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/Makefile.am	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,117 +0,0 @@
-#SUBDIRS = etc replace familiar libbb
-SUBDIRS = etc familiar libbb
-
-HOST_CPU=@host_cpu@
-BUILD_CPU=@build_cpu@
-IPKGLIBDIR=@ipkglibdir@ 
-ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DIPKGLIBDIR=\"@ipkglibdir@\" -DDATADIR=\"@datadir@\"
-
-bin_PROGRAMS = ipkg-cl
-
-lib_LTLIBRARIES = libipkg.la
-
-bin_SCRIPTS = update-alternatives
-
-interceptdir = $(datadir)/ipkg/intercept
-intercept_DATA = intercept/ldconfig intercept/depmod intercept/update-modules
-
-install-data-hook:
-	chmod +x $(DESTDIR)$(datadir)/ipkg/intercept/*
-
-# ipkg_LDADD = libbb/libbb.a replace/libreplace.a
-
-#ipkg_cl_LDADD = libipkg.la libbb/libbb.la replace/libreplace.a 
-ipkg_cl_LDADD = libipkg.la libbb/libbb.la 
-
-libipkg_includedir=$(includedir)/libipkg
-
-libipkg_include_HEADERS= \
-	args.h \
-	conffile.h \
-	conffile_list.h \
-	config.h \
-	hash_table.h \
-	includes.h \
-	ipkg_conf.h \
-	ipkg.h \
-	ipkg_message.h \
-	nv_pair.h \
-	nv_pair_list.h \
-	pkg_depends.h \
-	pkg_dest.h \
-	pkg_dest_list.h \
-	pkg.h \
-	pkg_hash.h \
-	pkg_src.h \
-	pkg_src_list.h \
-	pkg_vec.h \
-	str_list.h \
-	void_list.h \
-	libipkg.h 
-
-#\ replace/replace.h
-
-#libipkg_la_LIBADD = libbb/libbb.la replace/libreplace.a
-libipkg_la_LIBADD = libbb/libbb.la $(CURL_LIBS)
-
-ipkg_core_sources = args.c args.h ipkg.c \
-		    user.c user.h 
-ipkg_libcore_sources = args.c args.h libipkg.c libipkg.h ipkg.h\
-		    user.c user.h 
-ipkg_cmd_sources = ipkg_cmd.c ipkg_cmd.h \
-		   ipkg_configure.c ipkg_configure.h \
-		   ipkg_download.c ipkg_download.h \
-		   ipkg_install.c ipkg_install.h \
-		   ipkg_upgrade.c ipkg_upgrade.h \
-		   ipkg_remove.c ipkg_remove.h
-ipkg_db_sources = ipkg_conf.c ipkg_conf.h \
-		  ipkg_utils.c ipkg_utils.h pkg.c pkg.h hash_table.h \
-		  pkg_depends.c pkg_depends.h pkg_extract.c pkg_extract.h \
-		  hash_table.c pkg_hash.c pkg_hash.h pkg_parse.c pkg_parse.h \
-		  pkg_vec.c pkg_vec.h
-ipkg_list_sources = conffile.c conffile.h conffile_list.c conffile_list.h \
-		    nv_pair.c nv_pair.h nv_pair_list.c nv_pair_list.h \
-		    pkg_dest.c pkg_dest.h pkg_dest_list.c pkg_dest_list.h \
-		    pkg_src.c pkg_src.h pkg_src_list.c pkg_src_list.h \
-		    str_list.c str_list.h void_list.c void_list.h
-ipkg_util_sources = file_util.c file_util.h ipkg_message.h ipkg_message.c md5.c md5.h \
-		    sprintf_alloc.c sprintf_alloc.h str_util.c str_util.h \
-		    xregex.c xregex.h xsystem.c xsystem.h
-
-# ipkg_SOURCES = $(ipkg_core_sources) $(ipkg_cmd_sources) $(ipkg_db_sources) \
-#	       $(ipkg_util_sources) $(ipkg_list_sources)
-
-EXTRA_DIST = ipkg.c update-alternatives $(intercept_DATA)
-
-MAINTAINERCLEANFILES= \
-	configure \
-	Makefile.in \
-	config.guess \
-	config.sub \
-	ltmain.sh \
-	.Makefile.am.swp \
-	aclocal.m4
-
-libipkg_la_SOURCES = $(ipkg_libcore_sources) $(ipkg_cmd_sources) $(ipkg_db_sources) \
-	       $(ipkg_util_sources) $(ipkg_list_sources)
-
-ipkg_cl_SOURCES = ipkg-frontend.c
-
-libipkg_la_CFLAGS = -DIPKG_LIB $(ALL_CFLAGS)  $(CURL_CFLAGS)
-
-ipkg_CFLAGS = $(ALL_CFLAGS) $(CURL_CFLAGS)
-
-ipkg_cl_CFLAGS = -DIPKG_LIB $(ALL_CFLAGS)
-
-noinst_PROGRAMS = ipkg_hash_test ipkg_extract_test
-
-ipkg_hash_test_LDADD = libbb/libbb.la
-ipkg_hash_test_SOURCES = ipkg_hash_test.c $(ipkg_db_sources) $(ipkg_util_sources) $(ipkg_list_sources)
-ipkg_hash_test_CFLAGS = $(ALL_CFLAGS)
-
-ipkg_extract_test_LDADD = libbb/libbb.la
-ipkg_extract_test_SOURCES = ipkg_extract_test.c $(ipkg_db_sources) $(ipkg_util_sources) $(ipkg_list_sources)
-ipkg_extract_test_CFLAGS = $(ALL_CFLAGS)
-
-package: all-recursive
-	STRIPPROG=$(STRIP) familiar/rules INSTALL=$$PWD/install-sh  binary-arch

Copied: trunk/src/target/opkg/Makefile.am (from rev 3879, trunk/src/target/ipkg/Makefile.am)

Deleted: trunk/src/target/opkg/README
===================================================================
--- trunk/src/target/ipkg/README	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/README	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,3 +0,0 @@
-ipkg - The Itsy Package Management System
-
-See http://www.handhelds.org/moin/moin.cgi/Ipkg for more details about ipkg.

Copied: trunk/src/target/opkg/README (from rev 3879, trunk/src/target/ipkg/README)

Deleted: trunk/src/target/opkg/TODO
===================================================================
--- trunk/src/target/ipkg/TODO	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/TODO	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,108 +0,0 @@
-
-Things to do for ipkg, in a partial order:
-
-0) Play with configure to check for strdup/strndup ( to works with replace/replace.h stuffs )
-
-1) Fix incompatibilities between current C-based ipkg and original
-sh-based ipkg.
-
-1.a) Fix ipkg.conf options for http_proxy and friends. DONE:
-     http_proxy tested, (ftp_proxy, no_proxy, proxy_user, and
-     proxy_passwd have not been tested).
-
-1.b) Fix export of PKG_ROOT during pkg_run_script. DONE: tested.
-
-1.c) Fix so that a src with file:// is supported. DONE: tested.
-
-1.d) Fix paths in list files. DONE: tested.
-
-1.e) Fix offline_root mode. DONE: tested.
-
-2) Release ipkg as ipkg, (no longer as ipkg-unstable). This depends on
-   all of (1) being DONE. Although I might let this release proceed
-   without offline_root --- only Jamey will complain. ;-)
-
-3) Bug fixes
-
-3.a) fix all code marked "XXX: BUG"
-
-3.b) fix all outstanding ipkg bugzilla bugs
-
-3.c) conffiles support seems broken again. It's prompting on just
-     about every file. It might be because of file names beginning
-     with "///".
-	FIXED the "///" problem, (seemed harmless though), in 0.99.2
-	FIXED a problem with conffiles with -force-reinstall in 0.99.2.
-	This seems to be mostly working now, (I have seen strange
-	prompting on one out of the three ssh conffiles, maybe the
-	postinst script changed it? Hmmm... and something is going on
-	with pcmcia-cs too. Mysterious.)
-
-3.d) Test versioned Depends
-
-3.e) Test Provides.  DONE.
-
-3.f) Make sure Suggests, Recommends, (Enhances?), all work, (I know
-     some of these are not yet implemented)
-
-3.g) Audit all dpkg package fields for both parsing and printing support.
-
-3.h) "ipkg status" and "ipkg info" need to complain about unknown
-  packages. For that matter, these two commands should probably just
-  become aliases to the same functionality.
-
-  Jamey thinks ipkg status should be brief give one line per package, while
-  ipkg info can continue to be verbose. 7/23/2002.
-
-3.i) Currently "ipkg install foo" will upgrade foo if possible. The
-  "Package foo is already installed" check needs to be moved up to
-  avoid this.
-
-  Jamey thinkgs that "ipkg install foo" should upgrade foo.  7/23/2002.
-
-4) Implement new features
-
-4.a) start with all "XXX: FEATURE" comments
-
-4.b) implement all accepted ipkg bugzilla feature requests, (also
-     check old post "Subject: Reinventing ipkg" to see if we forgot
-     any of the good ideas we had once upon a time)
-
-4.c) ipkg remove needs to (prompt first) then remove packages for
-     which the dependencies will no longer be met. DONE. 7/19/2002.
-
-4.d) Add support for:
-	ipkg install foo from some-feed
-	ipkg install foo-0.4.3
-	ipkg install foo-latest # Only needed if we add a feed-order-priority option
-     or something like that.
-
-4.e) Orphaned dependency management (what is this -Jamey 7/23/2002)
-
-4.f) Add code for HTTP GET to eliminate wget dependence, (see
-     apps/urlget for code). We should probably still keep the wget
-     call as a backup.  
-
-     -- use busybox's internal wget -jamey 7/23/2002
-
-4.g) Experiment with making a small statically linked binary. Can we
-     eliminate some library calls, (glob, regcomp)? Can we get
-     something like uclibc to work well?
-
-4.h) Add support for a deb-src in /etc/ipkg.conf. (ARGH! Name clash
-     alert! In apt-land, deb-src means something very different than
-     what I would mean here. Hrm... Maybe src-deb would be cleaner? )
-
-     (What is this?  Jamey 7/23/2002) 
-
-4.i) Figure out a clever chroot mechanism for running maintainer scripts in
-     offline_root mode.
-
-4.j) Implement ipkg history mechanism, with undo and redo?  Keep track of
-     packages removed/installed by each call to ipkg.
-
-5) release ipkg-1.0.0
-
-6) Cleanup the code
-
-6.a) Start with all comments marked "XXX: CLEANUP"

Copied: trunk/src/target/opkg/TODO (from rev 3879, trunk/src/target/ipkg/TODO)

Deleted: trunk/src/target/opkg/args.c
===================================================================
--- trunk/src/target/ipkg/args.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/args.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,317 +0,0 @@
-/* args.c - parse command-line args
- 
-  Carl D. Worth
-
-  Copyright 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.
- */
-
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "ipkg.h"
-
-#include "config.h"
-#include "args.h"
-#include "sprintf_alloc.h"
-
-static void print_version(void);
-
-enum long_args_opt
-{
-     ARGS_OPT_FORCE_DEFAULTS = 129,
-     ARGS_OPT_FORCE_DEPENDS,
-     ARGS_OPT_FORCE_OVERWRITE,
-     ARGS_OPT_FORCE_DOWNGRADE,
-     ARGS_OPT_FORCE_REINSTALL,
-     ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES,
-     ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES,
-     ARGS_OPT_FORCE_SPACE,
-     ARGS_OPT_NOACTION,
-     ARGS_OPT_NODEPS,
-     ARGS_OPT_VERBOSE_WGET,
-     ARGS_OPT_VERBOSITY,
-     ARGS_OPT_MULTIPLE_PROVIDERS
-};
-
-int args_init(args_t *args)
-{
-     char *conf_file_dir;
-
-     memset(args, 0, sizeof(args_t));
-
-     args->dest = ARGS_DEFAULT_DEST;
-
-     conf_file_dir = getenv("IPKG_CONF_DIR");
-     if (conf_file_dir == NULL || conf_file_dir[0] == '\0') {
-	  conf_file_dir = ARGS_DEFAULT_CONF_FILE_DIR;
-     }
-     sprintf_alloc(&args->conf_file, "%s/%s", conf_file_dir,
-		   ARGS_DEFAULT_CONF_FILE_NAME);
-
-     args->force_defaults = ARGS_DEFAULT_FORCE_DEFAULTS;
-     args->force_depends = ARGS_DEFAULT_FORCE_DEPENDS;
-     args->force_overwrite = ARGS_DEFAULT_FORCE_OVERWRITE;
-     args->force_downgrade = ARGS_DEFAULT_FORCE_DOWNGRADE;
-     args->force_reinstall = ARGS_DEFAULT_FORCE_REINSTALL;
-     args->force_removal_of_dependent_packages = ARGS_DEFAULT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES;
-     args->force_removal_of_essential_packages = ARGS_DEFAULT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES;
-     args->noaction = ARGS_DEFAULT_NOACTION;
-     args->nodeps = ARGS_DEFAULT_NODEPS;
-     args->verbose_wget = ARGS_DEFAULT_VERBOSE_WGET;
-     args->verbosity = ARGS_DEFAULT_VERBOSITY;
-     args->offline_root = ARGS_DEFAULT_OFFLINE_ROOT;
-     args->offline_root_pre_script_cmd = ARGS_DEFAULT_OFFLINE_ROOT_PRE_SCRIPT_CMD;
-     args->offline_root_post_script_cmd = ARGS_DEFAULT_OFFLINE_ROOT_POST_SCRIPT_CMD;
-     args->multiple_providers = 0;
-     args->nocheckfordirorfile = 0;
-     args->noreadfeedsfile = 0;
-
-     return 1;
-}
-
-void args_deinit(args_t *args)
-{
-     free(args->conf_file);
-     args->conf_file = NULL;
-}
-
-int args_parse(args_t *args, int argc, char *argv[])
-{
-     int c;
-     int option_index = 0;
-     int parse_err = 0;
-     static struct option long_options[] = {
-	  {"query-all", 0, 0, 'A'},
-	  {"conf-file", 1, 0, 'f'},
-	  {"conf", 1, 0, 'f'},
-	  {"dest", 1, 0, 'd'},
-	  {"force-defaults", 0, 0, ARGS_OPT_FORCE_DEFAULTS},
-	  {"force_defaults", 0, 0, ARGS_OPT_FORCE_DEFAULTS},
-	  {"force-depends", 0, 0, ARGS_OPT_FORCE_DEPENDS},
-	  {"force_depends", 0, 0, ARGS_OPT_FORCE_DEPENDS},
-	  {"force-overwrite", 0, 0, ARGS_OPT_FORCE_OVERWRITE},
-	  {"force_overwrite", 0, 0, ARGS_OPT_FORCE_OVERWRITE},
-	  {"force_downgrade", 0, 0, ARGS_OPT_FORCE_DOWNGRADE},
-	  {"force-downgrade", 0, 0, ARGS_OPT_FORCE_DOWNGRADE},
-	  {"force-reinstall", 0, 0, ARGS_OPT_FORCE_REINSTALL},
-	  {"force_reinstall", 0, 0, ARGS_OPT_FORCE_REINSTALL},
-	  {"force-space", 0, 0, ARGS_OPT_FORCE_SPACE},
-	  {"force_space", 0, 0, ARGS_OPT_FORCE_SPACE},
-	  {"recursive", 0, 0,
-	   ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES},
-	  {"force-removal-of-dependent-packages", 0, 0,
-	   ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES},
-	  {"force_removal_of_dependent_packages", 0, 0,
-	   ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES},
-	  {"force-removal-of-essential-packages", 0, 0,
-	   ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES},
-	  {"force_removal_of_essential_packages", 0, 0,
-	   ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES},
-	  {"multiple-providers", 0, 0, ARGS_OPT_MULTIPLE_PROVIDERS},
-	  {"multiple_providers", 0, 0, ARGS_OPT_MULTIPLE_PROVIDERS},
-	  {"noaction", 0, 0, ARGS_OPT_NOACTION},
-	  {"nodeps", 0, 0, ARGS_OPT_NODEPS},
-	  {"offline", 1, 0, 'o'},
-	  {"offline-root", 1, 0, 'o'},
-	  {"test", 0, 0, ARGS_OPT_NOACTION},
-	  {"tmp-dir", 1, 0, 't'},
-	  {"verbose-wget", 0, 0, ARGS_OPT_VERBOSE_WGET},
-	  {"verbose_wget", 0, 0, ARGS_OPT_VERBOSE_WGET},
-	  {"verbosity", 2, 0, 'V'},
-	  {"version", 0, 0, 'v'},
-	  {0, 0, 0, 0}
-     };
-
-     while (1) {
-	  c = getopt_long_only(argc, argv, "Ad:f:no:t:vV:", long_options, &option_index);
-	  if (c == -1)
-	       break;
-
-	  switch (c) {
-	  case 'A':
-	       args->query_all = 1;
-	       break;
-	  case 'd':
-	       args->dest = optarg;
-	       break;
-	  case 'f':
-	       free(args->conf_file);
-	       args->conf_file = strdup(optarg);
-	       break;
-	  case 'o':
-	       args->offline_root = optarg;
-	       break;
-	  case 'n':
-	       args->noaction = 1;
-	       break;
-	  case 't':
-	       args->tmp_dir = strdup(optarg);
-	       break;
-	  case 'v':
-	       print_version();
-	       exit(0);
-	  case 'V':
-	  case ARGS_OPT_VERBOSITY:
-	       if (optarg)
-		    args->verbosity = atoi(optarg);
-	       else
-		    args->verbosity += 1;
-	       break;
-	  case ARGS_OPT_FORCE_DEFAULTS:
-	       args->force_defaults = 1;
-	       break;
-	  case ARGS_OPT_FORCE_DEPENDS:
-	       args->force_depends = 1;
-	       break;
-	  case ARGS_OPT_FORCE_OVERWRITE:
-	       args->force_overwrite = 1;
-	       break;
-	  case ARGS_OPT_FORCE_DOWNGRADE:
-	       args->force_downgrade = 1;
-	       break;
-	  case ARGS_OPT_FORCE_REINSTALL:
-	       args->force_reinstall = 1;
-	       break;
-	  case ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES:
-	       args->force_removal_of_essential_packages = 1;
-	       break;
-	  case ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES:
-	       args->force_removal_of_dependent_packages = 1;
-	       break;
-	  case ARGS_OPT_FORCE_SPACE:
-	       args->force_space = 1;
-	       break;
-	  case ARGS_OPT_VERBOSE_WGET:
-	       args->verbose_wget = 1;
-	       break;
-	  case ARGS_OPT_MULTIPLE_PROVIDERS:
-	       args->multiple_providers = 1;
-	       break;
-	  case ARGS_OPT_NODEPS:
-	       args->nodeps = 1;
-	       break;
-	  case ARGS_OPT_NOACTION:
-	       args->noaction = 1;
-	       break;
-	  case ':':
-	       parse_err++;
-	       break;
-	  case '?':
-	       parse_err++;
-	       break;
-	  default:
-	       printf("Confusion: getopt_long returned %d\n", c);
-	  }
-     }
-    
-     if (parse_err) {
-	  return -parse_err;
-     } else {
-	  return optind;
-     }
-}
-
-void args_usage(char *complaint)
-{
-     if (complaint) {
-	  fprintf(stderr, "ipkg: %s\n", complaint);
-     }
-     print_version();
-     fprintf(stderr, "usage: ipkg [options...] sub-command [arguments...]\n");
-     fprintf(stderr, "where sub-command is one of:\n");
-    
-     fprintf(stderr, "\nPackage Manipulation:\n");
-     fprintf(stderr, "\tupdate  		Update list of available packages\n");
-     fprintf(stderr, "\tupgrade			Upgrade all installed packages to latest version\n");
-     fprintf(stderr, "\tinstall <pkg>		Download and install <pkg> (and dependencies)\n");
-     fprintf(stderr, "\tinstall <file.ipk>	Install package <file.ipk>\n");
-     fprintf(stderr, "\tconfigure [<pkg>]	Configure unpacked packages\n");
-     fprintf(stderr, "\tremove <pkg|regexp>	Remove package <pkg|packages following regexp>\n");
-     fprintf(stderr, "\tflag <flag> <pkg> ...	Flag package(s) <pkg>\n");
-     fprintf(stderr, "\t <flag>=hold|noprune|user|ok|installed|unpacked (one per invocation)	\n");
-    
-     fprintf(stderr, "\nInformational Commands:\n");
-     fprintf(stderr, "\tlist    		List available packages and descriptions\n");
-     fprintf(stderr, "\tlist_installed		List all and only the installed packages and description \n");
-     fprintf(stderr, "\tfiles <pkg>		List all files belonging to <pkg>\n");
-     fprintf(stderr, "\tsearch <file|regexp>		Search for a package providing <file>\n");
-#ifndef IPKG_LIB
-     fprintf(stderr, "\tinfo [pkg|regexp [<field>]]	Display all/some info fields for <pkg> or all\n");
-     fprintf(stderr, "\tstatus [pkg|regexp [<field>]]	Display all/some status fields for <pkg> or all\n");
-#else
-     fprintf(stderr, "\tinfo [pkg|regexp]		Display all info for <pkg>\n");
-     fprintf(stderr, "\tstatus [pkg|regexp]		Display all status for <pkg>\n");
-#endif
-     fprintf(stderr, "\tdownload <pkg>		Download <pkg> to current directory.\n");
-     fprintf(stderr, "\tcompare_versions <v1> <op> <v2>\n");
-     fprintf(stderr, "\t                          compare versions using <= < > >= = << >>\n");
-     fprintf(stderr, "\tprint_architecture      prints the architecture.\n");
-     fprintf(stderr, "\tprint_installation_architecture\n");
-     fprintf(stderr, "\twhatdepends [-A] [pkgname|pat]+\n");
-     fprintf(stderr, "\twhatdependsrec [-A] [pkgname|pat]+\n");
-     fprintf(stderr, "\twhatprovides [-A] [pkgname|pat]+\n");
-     fprintf(stderr, "\twhatconflicts [-A] [pkgname|pat]+\n");
-     fprintf(stderr, "\twhatreplaces [-A] [pkgname|pat]+\n");
-     fprintf(stderr, "\t                        prints the installation architecture.\n");    
-     fprintf(stderr, "\nOptions:\n");
-     fprintf(stderr, "\t-A                      Query all packages with whatdepends, whatprovides, whatreplaces, whatconflicts\n"); 
-     fprintf(stderr, "\t-V <level>               Set verbosity level to <level>. If no value is\n");
-     fprintf(stderr, "\t--verbosity <level>      provided increase verbosity by one. Verbosity levels:\n");
-     fprintf(stderr, "\t                         0 errors only\n");
-     fprintf(stderr, "\t                         1 normal messages (default)\n");
-     fprintf(stderr, "\t                         2 informative messages\n");
-     fprintf(stderr, "\t                         3 debug output\n");
-     fprintf(stderr, "\t-f <conf_file>		Use <conf_file> as the ipkg configuration file\n");
-     fprintf(stderr, "\t-conf <conf_file>	Default configuration file location\n");
-     fprintf(stderr, "				is %s/%s\n", ARGS_DEFAULT_CONF_FILE_DIR, ARGS_DEFAULT_CONF_FILE_NAME);
-     fprintf(stderr, "\t-d <dest_name>		Use <dest_name> as the the root directory for\n");
-     fprintf(stderr, "\t-dest <dest_name>	package installation, removal, upgrading.\n");
-     fprintf(stderr, "				<dest_name> should be a defined dest name from\n");
-     fprintf(stderr, "				the configuration file, (but can also be a\n");
-     fprintf(stderr, "				directory name in a pinch).\n");
-     fprintf(stderr, "\t-o <offline_root>	Use <offline_root> as the root directory for\n");
-     fprintf(stderr, "\t-offline <offline_root>	offline installation of packages.\n");
-     fprintf(stderr, "\t-verbose_wget		more wget messages\n");
-    
-     fprintf(stderr, "\tForce Options (use when ipkg is too smart for its own good):\n");
-     fprintf(stderr, "\t-force-depends		Make dependency checks warnings instead of errors\n");
-     fprintf(stderr, "\t				Install/remove package in spite of failed dependences\n");
-     fprintf(stderr, "\t-force-defaults		Use default options for questions asked by ipkg.\n");
-     fprintf(stderr, "				(no prompts). Note that this will not prevent\n");
-     fprintf(stderr, "				package installation scripts from prompting.\n");
-     fprintf(stderr, "\t-force-reinstall 	Allow ipkg to reinstall a package.\n");
-     fprintf(stderr, "\t-force-overwrite 	Allow ipkg to overwrite files from another package during an install.\n");
-     fprintf(stderr, "\t-force-downgrade 	Allow ipkg to downgrade packages.\n");
-     fprintf(stderr, "\t-force_space            Install even if there does not seem to be enough space.\n");
-     fprintf(stderr, "\t-noaction               No action -- test only\n");
-     fprintf(stderr, "\t-nodeps                 Do not follow dependences\n");
-     fprintf(stderr, "\t-force-removal-of-dependent-packages\n");
-     fprintf(stderr, "\t-recursive	 	Allow ipkg to remove package and all that depend on it.\n");
-     fprintf(stderr, "\t-test                   No action -- test only\n");
-     fprintf(stderr, "\t-t	 	        Specify tmp-dir.\n");
-     fprintf(stderr, "\t--tmp-dir 	        Specify tmp-dir.\n");
-     fprintf(stderr, "\n");
-     fprintf(stderr, "\tregexp could be something like 'pkgname*' '*file*' or similar\n");
-     fprintf(stderr, "\teg: ipkg info 'libstd*'  or ipkg search '*libop*' or ipkg remove 'libncur*'\n");
-     /* -force-removal-of-essential-packages	Let ipkg remove essential packages. 
-	Using this option is almost guaranteed to break your system, hence this option
-	is not even advertised in the usage statement. */
-     exit(1);
-}
-
-static void print_version(void)
-{
-     fprintf(stderr, "ipkg version %s\n", VERSION);
-}

Copied: trunk/src/target/opkg/args.c (from rev 3879, trunk/src/target/ipkg/args.c)

Deleted: trunk/src/target/opkg/args.h
===================================================================
--- trunk/src/target/ipkg/args.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/args.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,72 +0,0 @@
-/* args.h - parse command-line args
-
-  Carl D. Worth
-
-  Copyright 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 ARGS_H
-#define ARGS_H
-
-struct args
-{
-    char *conf_file;
-    char *dest;
-    char *tmp_dir;
-    int force_defaults;
-    int force_depends;
-    int force_overwrite;
-    int force_downgrade;
-    int force_reinstall;
-    int force_removal_of_essential_packages;
-    int force_removal_of_dependent_packages;
-    int force_space;
-    int noaction;
-    int nodeps;
-    int multiple_providers;
-    int query_all;
-    int verbose_wget;
-    int verbosity;
-    int nocheckfordirorfile;
-    int noreadfeedsfile;
-    char *offline_root;
-    char *offline_root_pre_script_cmd;
-    char *offline_root_post_script_cmd;
-};
-typedef struct args args_t;
-
-#define ARGS_DEFAULT_CONF_FILE_DIR "/etc"
-#define ARGS_DEFAULT_CONF_FILE_NAME "ipkg.conf"
-#define ARGS_DEFAULT_DEST NULL
-#define ARGS_DEFAULT_FORCE_DEFAULTS 0
-#define ARGS_DEFAULT_FORCE_DEPENDS 0
-#define ARGS_DEFAULT_FORCE_OVERWRITE 0 
-#define ARGS_DEFAULT_FORCE_DOWNGRADE 0 
-#define ARGS_DEFAULT_FORCE_REINSTALL 0
-#define ARGS_DEFAULT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES 0
-#define ARGS_DEFAULT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES 0
-#define ARGS_DEFAULT_FORCE_SPACE 0
-#define ARGS_DEFAULT_OFFLINE_ROOT NULL
-#define ARGS_DEFAULT_OFFLINE_ROOT_PRE_SCRIPT_CMD NULL
-#define ARGS_DEFAULT_OFFLINE_ROOT_POST_SCRIPT_CMD NULL
-#define ARGS_DEFAULT_NOACTION 0
-#define ARGS_DEFAULT_NODEPS 0
-#define ARGS_DEFAULT_VERBOSE_WGET 0
-#define ARGS_DEFAULT_VERBOSITY 1
-
-int args_init(args_t *args);
-void args_deinit(args_t *args);
-int args_parse(args_t *args, int argc, char *argv[]);
-void args_usage(char *complaint);
-
-#endif

Copied: trunk/src/target/opkg/args.h (from rev 3879, trunk/src/target/ipkg/args.h)

Deleted: trunk/src/target/opkg/conffile.c
===================================================================
--- trunk/src/target/ipkg/conffile.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/conffile.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,64 +0,0 @@
-/* conffile.c - 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.
-*/
-
-#include <string.h>
-#include <stdlib.h>
-
-#include "ipkg.h"
-#include "ipkg_message.h"
-
-#include "conffile.h"
-#include "file_util.h"
-#include "sprintf_alloc.h"
-
-int conffile_init(conffile_t *conffile, const char *file_name, const char *md5sum)
-{
-    return nv_pair_init(conffile, file_name, md5sum);
-}
-
-void conffile_deinit(conffile_t *conffile)
-{
-    nv_pair_deinit(conffile);
-}
-
-int conffile_has_been_modified(ipkg_conf_t *conf, conffile_t *conffile)
-{
-    char *md5sum;
-    char *filename = conffile->name;
-    char *root_filename;
-    int ret;
-
-    if (conffile->value == NULL) {
-	 ipkg_message(conf, IPKG_NOTICE, "%s: conffile %s has no md5sum\n", __FUNCTION__, conffile->name);
-	 return 1;
-    }
-
-    root_filename = root_filename_alloc(conf, filename);
-
-    md5sum = file_md5sum_alloc(root_filename);
-
-    ret = strcmp(md5sum, conffile->value);
-    if (ret) {
-      ipkg_message(conf, IPKG_NOTICE, "%s: conffile %s: \t\nold md5=%s \t\nnew md5=%s\n", __FUNCTION__,
-              conffile->name, md5sum, conffile->value);
-    }
-
-    free(root_filename);
-    free(md5sum);
-
-    return ret;
-}

Copied: trunk/src/target/opkg/conffile.c (from rev 3879, trunk/src/target/ipkg/conffile.c)

Deleted: trunk/src/target/opkg/conffile.h
===================================================================
--- trunk/src/target/ipkg/conffile.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/conffile.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,30 +0,0 @@
-/* conffile.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 CONFFILE_H
-#define CONFFILE_H
-
-#include "nv_pair.h"
-
-typedef struct nv_pair conffile_t;
-
-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 ipkg_conf *conf, conffile_t *conffile);
-
-#endif
-

Copied: trunk/src/target/opkg/conffile.h (from rev 3879, trunk/src/target/ipkg/conffile.h)

Deleted: trunk/src/target/opkg/conffile_list.c
===================================================================
--- trunk/src/target/ipkg/conffile_list.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/conffile_list.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,47 +0,0 @@
-/* conffile_list.c - 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.
-*/
-
-#include "ipkg.h"
-
-#include "conffile_list.h"
-
-int conffile_list_init(conffile_list_t *list)
-{
-    return nv_pair_list_init(list);
-}
-
-void conffile_list_deinit(conffile_list_t *list)
-{
-    nv_pair_list_deinit(list);
-}
-
-conffile_t *conffile_list_append(conffile_list_t *list, const char *file_name,
-			 const char *md5sum)
-{
-    return nv_pair_list_append(list, file_name, md5sum);
-}
-
-int conffile_list_push(conffile_list_t *list, conffile_t *data)
-{
-    return nv_pair_list_push(list, data);
-}
-
-conffile_list_elt_t *conffile_list_pop(conffile_list_t *list)
-{
-    return nv_pair_list_pop(list);
-}
-

Copied: trunk/src/target/opkg/conffile_list.c (from rev 3879, trunk/src/target/ipkg/conffile_list.c)

Deleted: trunk/src/target/opkg/configure.ac
===================================================================
--- trunk/src/target/ipkg/configure.ac	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/configure.ac	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,73 +0,0 @@
-# Process this file with autoconf to produce a configure script
-AC_INIT(ipkg.c)
-AM_INIT_AUTOMAKE([ipkg], [0.99.163])
-AM_CONFIG_HEADER(config.h)
-
-AC_CANONICAL_HOST
-
-
-for top_builddir in . .. ../.. $ac_auxdir $ac_auxdir/..; do
-  test -f $top_builddir/configure && break
-done
-
-
-# Checks for programs
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AM_PROG_INSTALL_STRIP
-AC_PROG_LIBTOOL
-
-# Checks for libraries (hah! ipkg is pretty much self-contained)
-PKG_CHECK_MODULES(CURL, libcurl)
-
-# Checks for header files
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([errno.h fcntl.h memory.h regex.h stddef.h stdlib.h string.h strings.h unistd.h utime.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_UID_T
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_CHECK_MEMBERS([struct stat.st_rdev])
-
-# Don't do annoying tests that don't work when cross-compiling, just trust them.
-# The AC_FUNC_MEMCMP test doesn't work during a cross-compile, disable.
-# AC_FUNC_MEMCMP
-# The AC_FUNC_STAT test doesn't work during a cross-compile, disable.
-# AC_FUNC_STAT
-
-# Checks for library functions
-AC_FUNC_CHOWN
-AC_FUNC_FORK
-AC_TYPE_SIGNAL
-AC_FUNC_UTIME_NULL
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([memmove memset mkdir regcomp strchr strcspn strdup strerror strndup strrchr strstr strtol strtoul sysinfo utime])
-
-ipkglibdir=
-AC_ARG_WITH(ipkglibdir,
-[  --with-ipkglibdir=DIR   specifies directory to put status and info files.
-                          "/ipkg" is always added so if you want your files 
-                          to be in /usr/lib/ipkg you should indicate 
-                          --with-ipkglibdir=/usr/lib ],
-[case "${withval}" in
-yes)    AC_MSG_ERROR(bad value ${withval} given for ipkg libs directories ) ;;
-no)     ;;
-*)      ipkglibdir=$with_ipkglibdir ;;
-esac])
-
-# Default local prefix if it is empty
-if test x$ipkglibdir = x; then
-        ipkglibdir=/usr/lib
-fi
-
-AC_SUBST(ipkglibdir)
-
-AC_OUTPUT(Makefile etc/Makefile familiar/Makefile familiar/control familiar/control-unstripped familiar/libipkg-control  familiar/libipkg-dev-control libbb/Makefile libipkg.pc ipkg.h)

Copied: trunk/src/target/opkg/configure.ac (from rev 3879, trunk/src/target/ipkg/configure.ac)

Deleted: trunk/src/target/opkg/familiar/control-unstripped.in
===================================================================
--- trunk/src/target/ipkg/familiar/control-unstripped.in	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/familiar/control-unstripped.in	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,22 +0,0 @@
-Package: ipkg-unstripped
-Replaces: ipkg
-Version: @VERSION@
-Section: base
-Priority: required
-Essential: yes
-Architecture: @host_cpu@
-Maintainer: Jamey Hicks <jamey at handhelds.org>
-Source: http://www.handhelds.org/packages/ipkg/ipkg-@VERSION@.tar.gz
-Depends: libc6, busybox 
-Description: lightweight package management system
- ipkg is the Itsy Package Management System, for handling
- installation and removal of packages on a system. It can
- recursively follow dependencies and download all packages
- necessary to install a particular package.
- .
- ipkg knows how to install both .ipk and .deb packages.
- .
- ipkg is intended to serve the same functions (and more) for
- Familiar that dpkg and apt serve for Debian, (while taking
- up much less space).
-

Copied: trunk/src/target/opkg/familiar/control-unstripped.in (from rev 3879, trunk/src/target/ipkg/familiar/control-unstripped.in)

Deleted: trunk/src/target/opkg/familiar/control.in
===================================================================
--- trunk/src/target/ipkg/familiar/control.in	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/familiar/control.in	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,21 +0,0 @@
-Package: ipkg
-Version: @VERSION@
-Section: base
-Priority: required
-Essential: yes
-Architecture: @host_cpu@
-Maintainer: Pierluigi Frullani <pigi at frumar.it>
-Source: http://www.handhelds.org/packages/ipkg/ipkg-@VERSION@.tar.gz
-Depends: libc6, libipkg (>= @VERSION@)
-Description: lightweight package management system
- ipkg is the Itsy Package Management System, for handling
- installation and removal of packages on a system. It can
- recursively follow dependencies and download all packages
- necessary to install a particular package.
- .
- ipkg knows how to install both .ipk and .deb packages.
- .
- ipkg is intended to serve the same functions (and more) for
- Familiar that dpkg and apt serve for Debian, (while taking
- up much less space).
-

Copied: trunk/src/target/opkg/familiar/control.in (from rev 3879, trunk/src/target/ipkg/familiar/control.in)

Deleted: trunk/src/target/opkg/familiar/libipkg-control.in
===================================================================
--- trunk/src/target/ipkg/familiar/libipkg-control.in	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/familiar/libipkg-control.in	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,21 +0,0 @@
-Package: libipkg
-Version: @VERSION@
-Section: base
-Priority: optional
-Essential: yes
-Architecture: @host_cpu@
-Maintainer: Jamey Hicks <jamey at handhelds.org>
-Source: http://www.handhelds.org/packages/ipkg/ipkg-@VERSION@.tar.gz
-Depends: libc6, busybox
-Description: lightweight package management system
- ipkg is the Itsy Package Management System, for handling
- installation and removal of packages on a system. It can
- recursively follow dependencies and download all packages
- necessary to install a particular package.
- .
- ipkg knows how to install both .ipk and .deb packages.
- .
- ipkg is intended to serve the same functions (and more) for
- Familiar that dpkg and apt serve for Debian, (while taking
- up much less space).
-

Deleted: trunk/src/target/opkg/familiar/libipkg-dev-control.in
===================================================================
--- trunk/src/target/ipkg/familiar/libipkg-dev-control.in	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/familiar/libipkg-dev-control.in	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,21 +0,0 @@
-Package: libipkg-dev
-Version: @VERSION@
-Section: base
-Priority: optional
-Essential: yes
-Architecture: @host_cpu@
-Maintainer: Jamey Hicks <jamey at handhelds.org>
-Source: http://www.handhelds.org/packages/ipkg/ipkg-@VERSION@.tar.gz
-Depends: libipkg
-Description: lightweight package management system
- ipkg is the Itsy Package Management System, for handling
- installation and removal of packages on a system. It can
- recursively follow dependencies and download all packages
- necessary to install a particular package.
- .
- ipkg knows how to install both .ipk and .deb packages.
- .
- ipkg is intended to serve the same functions (and more) for
- Familiar that dpkg and apt serve for Debian, (while taking
- up much less space).
-

Copied: trunk/src/target/opkg/familiar/libopkg-control.in (from rev 3879, trunk/src/target/ipkg/familiar/libopkg-control.in)

Copied: trunk/src/target/opkg/familiar/libopkg-dev-control.in (from rev 3879, trunk/src/target/ipkg/familiar/libopkg-dev-control.in)

Deleted: trunk/src/target/opkg/file_util.c
===================================================================
--- trunk/src/target/ipkg/file_util.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/file_util.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,177 +0,0 @@
-/* file_util.c - convenience routines for common stat operations
-
-   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.
-*/
-
-#include "ipkg.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "sprintf_alloc.h"
-#include "file_util.h"
-#include "md5.h"
-#include "libbb/libbb.h"
-#undef strlen
-
-int file_exists(const char *file_name)
-{
-    int err;
-    struct stat stat_buf;
-
-    err = stat(file_name, &stat_buf);
-    if (err == 0) {
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-int file_is_dir(const char *file_name)
-{
-    int err;
-    struct stat stat_buf;
-
-    err = stat(file_name, &stat_buf);
-    if (err) {
-	return 0;
-    }
-
-    return S_ISDIR(stat_buf.st_mode);
-}
-
-/* read a single line from a file, stopping at a newline or EOF.
-   If a newline is read, it will appear in the resulting string.
-   Return value is a malloc'ed char * which should be freed at
-   some point by the caller.
-
-   Return value is NULL if the file is at EOF when called.
-*/
-#define FILE_READ_LINE_BUF_SIZE 1024
-char *file_read_line_alloc(FILE *file)
-{
-    char buf[FILE_READ_LINE_BUF_SIZE];
-    int buf_len;
-    char *line = NULL;
-    int line_size = 0;
-
-    memset(buf, 0, FILE_READ_LINE_BUF_SIZE);
-    while (fgets(buf, FILE_READ_LINE_BUF_SIZE, file)) {
-	buf_len = strlen(buf);
-	if (line) {
-	    line_size += buf_len;
-	    line = realloc(line, line_size);
-	    if (line == NULL) {
-		fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-		break;
-	    }
-	    strcat(line, buf);
-	} else {
-	    line_size = buf_len + 1;
-	    line = strdup(buf);
-	}
-	if (buf[buf_len - 1] == '\n') {
-	    break;
-	}
-    }
-
-    return line;
-}
-
-int file_move(const char *src, const char *dest)
-{
-    int err;
-
-    err = rename(src, dest);
-
-    if (err && errno == EXDEV) {
-	err = file_copy(src, dest);
-	unlink(src);
-    } else if (err) {
-	fprintf(stderr, "%s: ERROR: failed to rename %s to %s: %s\n",
-		__FUNCTION__, src, dest, strerror(errno));
-    }
-
-    return err;
-}
-
-/* I put these here to keep libbb dependencies from creeping all over
-   the ipkg code */
-int file_copy(const char *src, const char *dest)
-{
-    int err;
-
-    err = copy_file(src, dest, FILEUTILS_FORCE | FILEUTILS_PRESERVE_STATUS);
-    if (err) {
-	fprintf(stderr, "%s: ERROR: failed to copy %s to %s\n",
-		__FUNCTION__, src, dest);
-    }
-
-    return err;
-}
-
-int file_mkdir_hier(const char *path, long mode)
-{
-    return make_directory(path, mode, FILEUTILS_RECUR);
-}
-
-char *file_md5sum_alloc(const char *file_name)
-{
-    static const int md5sum_bin_len = 16;
-    static const int md5sum_hex_len = 32;
-
-    static const unsigned char bin2hex[16] = {
-	'0', '1', '2', '3',
-	'4', '5', '6', '7',
-	'8', '9', 'a', 'b',
-	'c', 'd', 'e', 'f'
-    };
-
-    int i, err;
-    FILE *file;
-    unsigned char *md5sum_hex;
-    unsigned char md5sum_bin[md5sum_bin_len];
-
-    md5sum_hex = malloc(md5sum_hex_len + 1);
-    if (md5sum_hex == NULL) {
-	fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	return strdup("");
-    }
-
-    file = fopen(file_name, "r");
-    if (file == NULL) {
-	fprintf(stderr, "%s: Failed to open file %s: %s\n",
-		__FUNCTION__, file_name, strerror(errno));
-	return strdup("");
-    }
-
-    err = md5_stream(file, md5sum_bin);
-    if (err) {
-	fprintf(stderr, "%s: ERROR computing md5sum for %s: %s\n",
-		__FUNCTION__, file_name, strerror(err));
-	return strdup("");
-    }
-
-    fclose(file);
-
-    for (i=0; i < md5sum_bin_len; i++) {
-	md5sum_hex[i*2] = bin2hex[md5sum_bin[i] >> 4];
-	md5sum_hex[i*2+1] = bin2hex[md5sum_bin[i] & 0xf];
-    }
-    
-    md5sum_hex[md5sum_hex_len] = '\0';
-    
-    return md5sum_hex;
-}
-

Copied: trunk/src/target/opkg/file_util.c (from rev 3879, trunk/src/target/ipkg/file_util.c)

Deleted: trunk/src/target/opkg/hash_table.c
===================================================================
--- trunk/src/target/ipkg/hash_table.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/hash_table.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,155 +0,0 @@
-/* hash.c - hash tables for ipkg
-
-   Steven M. Ayer, Jamey Hicks
-   
-   Copyright (C) 2002 Compaq Computer Corporation
-
-   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 <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "hash_table.h"
-#include "ipkg_message.h"
-
-
-static int hash_index(hash_table_t *hash, const char *pkg_name);
-static int rotating(const char *key, int len, int prime);
-
-static int hash_index(hash_table_t *hash, const char *pkg_name)
-{
-    return rotating(pkg_name, strlen(pkg_name), hash->n_entries);
-}
-  
-static int rotating(const char *key, int len, int prime)
-{
-    unsigned int hash, i;
-    for (hash=len, i=0; i<len; ++i)
-	hash = (hash<<4)^(hash>>28)^key[i];
-    return (hash % prime);
-}
-
-
-/*
- * this is an open table keyed by strings
- */
-int hash_table_init(const char *name, hash_table_t *hash, int len)
-{
-    static int primes_table[] = {
-	379, 761, 983, 1423, 2711, 3361, 3931, 4679, 5519, 6701, 9587,
-	19471, 23143, 33961, 46499, 49727, 99529, 0
-    };
-    int *picker;
-
-    if (hash->entries != NULL) {
-    	/* we have been here already */
-    	return 0;
-    }
-
-    hash->name = name;
-    hash->entries = NULL;
-    hash->n_entries = 0;
-    hash->hash_entry_key = NULL;
-
-    picker = primes_table;
-    while(*picker && (*picker++ < len));
-    if(!*picker)
-	fprintf(stderr, "%s: primes table might not be big enough (! << %d)\n", __FUNCTION__, len);
-    --picker;
-
-    hash->n_entries = *picker;
-    hash->entries = (hash_entry_t *)calloc(hash->n_entries, sizeof(hash_entry_t));
-    if (hash->entries == NULL) {
-	fprintf(stderr, "%s: Out of memory.\n", __FUNCTION__);
-	return ENOMEM;
-    }
-    return 0;
-}
-
-void hash_table_deinit(hash_table_t *hash)
-{
-    free(hash->entries);
-    hash->entries = NULL;
-    hash->n_entries = 0;
-}
-
-void *hash_table_get(hash_table_t *hash, const char *key)
-{
-  int ndx= hash_index(hash, key);
-  hash_entry_t *hash_entry = hash->entries + ndx;
-  while (hash_entry) 
-  {
-    if (hash_entry->key) 
-    {
-      if (strcmp(key, hash_entry->key) == 0) {
-         // ipkg_message(NULL, IPKG_DEBUG, "Function: %s. Key found for '%s' \n", __FUNCTION__, key);
-	 return hash_entry->data;
-      }
-    }
-    hash_entry = hash_entry->next;
-  }
-  return NULL;
-}
-
-int hash_table_insert(hash_table_t *hash, const char *key, void *value)
-{
-     int ndx= hash_index(hash, key);
-     hash_entry_t *hash_entry = hash->entries + ndx;
-     if (0) ipkg_message(NULL, IPKG_DEBUG2, "Function: %s. Inserting in hash for '%s' \n", __FUNCTION__, key);
-     if (hash_entry->key) {
-	  if (strcmp(hash_entry->key, key) == 0) {
-	       /* alread in table, update the value */
-               if (0) ipkg_message(NULL, IPKG_DEBUG2, "Function: %s. Value already in hash for '%s' \n", __FUNCTION__, key);
-	       hash_entry->data = value;
-	       return 0;
-	  } else {
-	       /* 
-		* if this is a collision, we have to go to the end of the ll,
-		* then add a new entry
-		* before we can hook up the value
-		*/
-               if (0) ipkg_message(NULL, IPKG_DEBUG2, "Function: %s. Value already in hash by collision for '%s' \n", __FUNCTION__, key);
-	       while (hash_entry->next)
-		    hash_entry = hash_entry->next;
-	       hash_entry->next = (hash_entry_t *)malloc(sizeof(hash_entry_t));
-	       if (!hash_entry->next) {
-		    return -ENOMEM;
-	       }
-	       hash_entry = hash_entry->next;
-	       hash_entry->next = NULL;
-	  }
-     }
-     hash->n_elements++;
-     hash_entry->key = strdup(key);
-     hash_entry->data = value;
-
-     return 0;
-}
-
-
-void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data)
-{ 
-    int i;
-    if (!hash || !f)
-	return;
-
-    for (i = 0; i < hash->n_entries; i++) {
-	hash_entry_t *hash_entry = (hash->entries + i);
-	do {
-	    if(hash_entry->key) {
-		f(hash_entry->key, hash_entry->data, data);
-	    }
-	} while((hash_entry = hash_entry->next));
-    }
-}
-

Copied: trunk/src/target/opkg/hash_table.c (from rev 3879, trunk/src/target/ipkg/hash_table.c)

Deleted: trunk/src/target/opkg/hash_table.h
===================================================================
--- trunk/src/target/ipkg/hash_table.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/hash_table.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,44 +0,0 @@
-/* hash.h - hash tables for ipkg
-
-   Steven M. Ayer, Jamey Hicks
-   
-   Copyright (C) 2002 Compaq Computer Corporation
-
-   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 _HASH_TABLE_H_
-#define _HASH_TABLE_H_
-
-typedef struct hash_entry hash_entry_t;
-typedef struct hash_table hash_table_t;
-
-struct hash_entry {
-  const char * key;
-  void * data;
-  struct hash_entry * next;
-};
-
-struct hash_table {
-  const char *name; 
-  hash_entry_t * entries;  
-  int n_entries; /* number of buckets */
-  int n_elements;
-  const char * (*hash_entry_key)(void * data);
-};
-
-int hash_table_init(const char *name, hash_table_t *hash, int len);
-void hash_table_deinit(hash_table_t *hash);
-void *hash_table_get(hash_table_t *hash, const char *key);
-int hash_table_insert(hash_table_t *hash, const char *key, void *value);
-void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data);
-
-#endif /* _HASH_TABLE_H_ */

Copied: trunk/src/target/opkg/hash_table.h (from rev 3879, trunk/src/target/ipkg/hash_table.h)

Deleted: trunk/src/target/opkg/intercept/depmod
===================================================================
--- trunk/src/target/ipkg/intercept/depmod	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/intercept/depmod	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x-a" ] || [ "x$1" = "x-A" ]; then
-  if [ ! -f $IPKG_INTERCEPT_DIR/depmod ]; then
-    echo "depmod -A" > $IPKG_INTERCEPT_DIR/depmod
-    chmod +x $IPKG_INTERCEPT_DIR/depmod
-  fi
-  exit 0
-fi
-
-/sbin/depmod $*
-

Copied: trunk/src/target/opkg/intercept/depmod (from rev 3879, trunk/src/target/ipkg/intercept/depmod)

Deleted: trunk/src/target/opkg/intercept/ldconfig
===================================================================
--- trunk/src/target/ipkg/intercept/ldconfig	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/intercept/ldconfig	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ ! -f $IPKG_INTERCEPT_DIR/ldconfig ]; then
-  echo "ldconfig" > $IPKG_INTERCEPT_DIR/ldconfig
-  chmod +x $IPKG_INTERCEPT_DIR/ldconfig
-fi
-

Copied: trunk/src/target/opkg/intercept/ldconfig (from rev 3879, trunk/src/target/ipkg/intercept/ldconfig)

Deleted: trunk/src/target/opkg/intercept/update-modules
===================================================================
--- trunk/src/target/ipkg/intercept/update-modules	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/intercept/update-modules	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ ! -f $IPKG_INTERCEPT_DIR/update-modules ]; then
-  echo "update-modules" > $IPKG_INTERCEPT_DIR/update-modules
-  chmod +x $IPKG_INTERCEPT_DIR/update-modules
-fi
-

Copied: trunk/src/target/opkg/intercept/update-modules (from rev 3879, trunk/src/target/ipkg/intercept/update-modules)

Deleted: trunk/src/target/opkg/ipkg-frontend.c
===================================================================
--- trunk/src/target/ipkg/ipkg-frontend.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg-frontend.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,28 +0,0 @@
-/* ipkg-frontend.c - the itsy package management system
-
-   Florina 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.
-   
-   ipkg command line frontend using libipkg
-   
-*/
-
-#include "libipkg.h"
-
-/* This is really small, eh? ;-) */
-
-int main(int argc, char *argv[])
-{
-	return ipkg_op(argc,argv);	
-}

Deleted: trunk/src/target/opkg/ipkg.c
===================================================================
--- trunk/src/target/ipkg/ipkg.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,81 +0,0 @@
-/* ipkg.c - 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.
-*/
-
-#include "ipkg.h"
-
-#include "args.h"
-#include "ipkg_conf.h"
-#include "ipkg_cmd.h"
-
-int main(int argc, const char *argv[])
-{
-    int err, optind;
-    args_t args;
-    char *cmd_name;
-    ipkg_cmd_t *cmd;
-    ipkg_conf_t ipkg_conf;
-
-    error_list=NULL;
-
-    args_init(&args);
-	
-    optind = args_parse(&args, argc, argv);
-    if (optind == argc || optind < 0) {
-	args_usage("ipkg must have one sub-command argument");
-    }
-
-    cmd_name = argv[optind++];
-
-    err = ipkg_conf_init(&ipkg_conf, &args);
-    if (err) {
-	return err;
-    }
-
-    args_deinit(&args);
-
-    cmd = ipkg_cmd_find(cmd_name);
-    if (cmd == NULL) {
-	fprintf(stderr, "%s: unknown sub-command %s\n", argv[0], cmd_name);
-	args_usage(NULL);
-    }
-
-    if (cmd->requires_args && optind == argc) {
-	fprintf(stderr, "%s: the ``%s'' command requires at least one argument\n",
-		__FUNCTION__, cmd_name);
-	args_usage(NULL);
-    }
-
-    err = ipkg_cmd_exec(cmd, &ipkg_conf, argc - optind, argv + optind);
-
-    if ( err == 0 ) {
-       ipkg_message(ipkg_conf, IPKG_NOTICE, "Succesfully done.\n");
-    } else {
-       ipkg_message(ipkg_conf, IPKG_NOTICE, "Error returned. Return value is %d\n.",err);
-
-}
-
-    }
-    /* XXX: FEATURE request: run ldconfig and/or depmod after package needing them are installed or removed */  
-    // ipkg_global_postinst();
-
-    ipkg_conf_deinit(&ipkg_conf);
-
-    return err;
-}
-
-
-

Deleted: trunk/src/target/opkg/ipkg.h
===================================================================
--- trunk/src/target/ipkg/ipkg.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,68 +0,0 @@
-/* ipkg.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 IPKG_H
-#define IPKG_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#if 0
-#define IPKG_DEBUG_NO_TMP_CLEANUP
-#endif
-
-#include "includes.h"
-#include "ipkg_conf.h"
-#include "ipkg_message.h"
-
-#define IPKG_PKG_EXTENSION ".ipk"
-#define DPKG_PKG_EXTENSION ".deb"
-
-#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
-#define IPKG_PKG_VERSION_SEP_CHAR '_'
-
-#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg"
-#define IPKG_LISTS_DIR_SUFFIX "lists"
-#define IPKG_INFO_DIR_SUFFIX "info"
-#define IPKG_STATUS_FILE_SUFFIX "status"
-
-#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
-
-#define IPKG_LIST_DESCRIPTION_LENGTH 128
-
-enum ipkg_error {
-    IPKG_SUCCESS = 0,
-    IPKG_PKG_DEPS_UNSATISFIED,
-    IPKG_PKG_IS_ESSENTIAL,
-    IPKG_PKG_HAS_DEPENDENTS,
-    IPKG_PKG_HAS_NO_CANDIDATE
-};
-typedef enum ipkg_error ipkg_error_t;
-
-extern int ipkg_state_changed;
-
-
-struct errlist {
-    char * errmsg;
-    struct errlist * next;
-} ;
-
-struct errlist* error_list;
-
-
-#endif

Deleted: trunk/src/target/opkg/ipkg.h.in
===================================================================
--- trunk/src/target/ipkg/ipkg.h.in	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg.h.in	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,68 +0,0 @@
-/* ipkg.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 IPKG_H
-#define IPKG_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#if 0
-#define IPKG_DEBUG_NO_TMP_CLEANUP
-#endif
-
-#include "includes.h"
-#include "ipkg_conf.h"
-#include "ipkg_message.h"
-
-#define IPKG_PKG_EXTENSION ".ipk"
-#define DPKG_PKG_EXTENSION ".deb"
-
-#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
-#define IPKG_PKG_VERSION_SEP_CHAR '_'
-
-#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg"
-#define IPKG_LISTS_DIR_SUFFIX "lists"
-#define IPKG_INFO_DIR_SUFFIX "info"
-#define IPKG_STATUS_FILE_SUFFIX "status"
-
-#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
-
-#define IPKG_LIST_DESCRIPTION_LENGTH 128
-
-enum ipkg_error {
-    IPKG_SUCCESS = 0,
-    IPKG_PKG_DEPS_UNSATISFIED,
-    IPKG_PKG_IS_ESSENTIAL,
-    IPKG_PKG_HAS_DEPENDENTS,
-    IPKG_PKG_HAS_NO_CANDIDATE
-};
-typedef enum ipkg_error ipkg_error_t;
-
-extern int ipkg_state_changed;
-
-
-struct errlist {
-    char * errmsg;
-    struct errlist * next;
-} ;
-
-struct errlist* error_list;
-
-
-#endif

Deleted: trunk/src/target/opkg/ipkg_cmd.c
===================================================================
--- trunk/src/target/ipkg/ipkg_cmd.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_cmd.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,1432 +0,0 @@
-/* ipkg_cmd.c - 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.
-*/
-
-#include <string.h>
-
-#include "ipkg.h"
-#include <libgen.h>
-#include <glob.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdio.h>
-#include <dirent.h>
-
-#include "ipkg_conf.h"
-#include "ipkg_cmd.h"
-#include "ipkg_message.h"
-#include "pkg.h"
-#include "pkg_dest.h"
-#include "pkg_parse.h"
-#include "sprintf_alloc.h"
-#include "pkg.h"
-#include "file_util.h"
-#include "str_util.h"
-#include "libbb/libbb.h"
-
-#include <fnmatch.h>
-
-
-#include "ipkg_download.h"
-#include "ipkg_install.h"
-#include "ipkg_upgrade.h"
-#include "ipkg_remove.h"
-#include "ipkg_configure.h"
-#include "ipkg_message.h"
-
-#ifdef IPKG_LIB
-#include "libipkg.h"
-static void *p_userdata = NULL;
-#endif
-
-static int ipkg_update_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_upgrade_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_list_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_info_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_status_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_install_pending_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_install_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_list_installed_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_remove_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_purge_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_flag_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_files_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_search_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_download_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_depends_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatdepends_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatdepends_recursively_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatsuggests_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatrecommends_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatprovides_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatconflicts_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_whatreplaces_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_compare_versions_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_print_architecture_cmd(ipkg_conf_t *conf, int argc, char **argv);
-static int ipkg_configure_cmd(ipkg_conf_t *conf, int argc, char **argv);
-
-/* XXX: CLEANUP: The usage strings should be incorporated into this
-   array for easier maintenance */
-static ipkg_cmd_t cmds[] = {
-     {"update", 0, (ipkg_cmd_fun_t)ipkg_update_cmd}, 
-     {"upgrade", 0, (ipkg_cmd_fun_t)ipkg_upgrade_cmd},
-     {"list", 0, (ipkg_cmd_fun_t)ipkg_list_cmd},
-     {"list_installed", 0, (ipkg_cmd_fun_t)ipkg_list_installed_cmd},
-     {"info", 0, (ipkg_cmd_fun_t)ipkg_info_cmd},
-     {"flag", 1, (ipkg_cmd_fun_t)ipkg_flag_cmd},
-     {"status", 0, (ipkg_cmd_fun_t)ipkg_status_cmd},
-     {"install_pending", 0, (ipkg_cmd_fun_t)ipkg_install_pending_cmd},
-     {"install", 1, (ipkg_cmd_fun_t)ipkg_install_cmd},
-     {"remove", 1, (ipkg_cmd_fun_t)ipkg_remove_cmd},
-     {"purge", 1, (ipkg_cmd_fun_t)ipkg_purge_cmd},
-     {"configure", 0, (ipkg_cmd_fun_t)ipkg_configure_cmd},
-     {"files", 1, (ipkg_cmd_fun_t)ipkg_files_cmd},
-     {"search", 1, (ipkg_cmd_fun_t)ipkg_search_cmd},
-     {"download", 1, (ipkg_cmd_fun_t)ipkg_download_cmd},
-     {"compare_versions", 1, (ipkg_cmd_fun_t)ipkg_compare_versions_cmd},
-     {"compare-versions", 1, (ipkg_cmd_fun_t)ipkg_compare_versions_cmd},
-     {"print-architecture", 0, (ipkg_cmd_fun_t)ipkg_print_architecture_cmd},
-     {"print_architecture", 0, (ipkg_cmd_fun_t)ipkg_print_architecture_cmd},
-     {"print-installation-architecture", 0, (ipkg_cmd_fun_t)ipkg_print_architecture_cmd},
-     {"print_installation_architecture", 0, (ipkg_cmd_fun_t)ipkg_print_architecture_cmd},
-     {"depends", 1, (ipkg_cmd_fun_t)ipkg_depends_cmd},
-     {"whatdepends", 1, (ipkg_cmd_fun_t)ipkg_whatdepends_cmd},
-     {"whatdependsrec", 1, (ipkg_cmd_fun_t)ipkg_whatdepends_recursively_cmd},
-     {"whatrecommends", 1, (ipkg_cmd_fun_t)ipkg_whatrecommends_cmd},
-     {"whatsuggests", 1, (ipkg_cmd_fun_t)ipkg_whatsuggests_cmd},
-     {"whatprovides", 1, (ipkg_cmd_fun_t)ipkg_whatprovides_cmd},
-     {"whatreplaces", 1, (ipkg_cmd_fun_t)ipkg_whatreplaces_cmd},
-     {"whatconflicts", 1, (ipkg_cmd_fun_t)ipkg_whatconflicts_cmd},
-};
-
-int ipkg_state_changed;
-static void write_status_files_if_changed(ipkg_conf_t *conf)
-{
-     if (ipkg_state_changed && !conf->noaction) {
-	  ipkg_message(conf, IPKG_INFO,
-		       "  writing status file\n");
-	  ipkg_conf_write_status_files(conf);
-	  pkg_write_changed_filelists(conf);
-     } else { 
-	  ipkg_message(conf, IPKG_NOTICE, "Nothing to be done\n");
-     }
-}
-
-
-static int num_cmds = sizeof(cmds) / sizeof(ipkg_cmd_t);
-
-ipkg_cmd_t *ipkg_cmd_find(const char *name)
-{
-     int i;
-     ipkg_cmd_t *cmd;
-
-     for (i=0; i < num_cmds; i++) {
-	  cmd = &cmds[i];
-	  if (strcmp(name, cmd->name) == 0) {
-	       return cmd;
-	  }
-     }
-
-     return NULL;
-}
-
-#ifdef IPKG_LIB
-int ipkg_cmd_exec(ipkg_cmd_t *cmd, ipkg_conf_t *conf, int argc, const char **argv, void *userdata)
-{
-	int result;
-	p_userdata = userdata;
-      
-
-	result = (cmd->fun)(conf, argc, argv);
-        if ( result == 0 ) {
-           ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n");
-        } else {
-           ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result);
-
-        }
-        if ( error_list ) {
-           reverse_error_list(&error_list);
-
-           ipkg_message(conf, IPKG_NOTICE, "Collected errors:\n");
-           /* Here we print the errors collected and free the list */
-           while (error_list != NULL) {
-                 ipkg_message(conf, IPKG_NOTICE, "%s",error_list->errmsg);
-                 error_list = error_list->next;
-
-           }
-           free_error_list(&error_list);
-
-        }
-   
-	p_userdata = NULL;
-	return result;
-}
-#else
-int ipkg_cmd_exec(ipkg_cmd_t *cmd, ipkg_conf_t *conf, int argc, const char **argv)
-{
-     return (cmd->fun)(conf, argc, argv);
-}
-#endif
-
-static int ipkg_update_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     int err;
-     int failures;
-     char *lists_dir;
-     pkg_src_list_elt_t *iter;
-     pkg_src_t *src;
-
- 
-    sprintf_alloc(&lists_dir, "%s", conf->restrict_to_default_dest ? conf->default_dest->lists_dir : conf->lists_dir);
- 
-    if (! file_is_dir(lists_dir)) {
-	  if (file_exists(lists_dir)) {
-	       ipkg_message(conf, IPKG_ERROR,
-			    "%s: ERROR: %s exists, but is not a directory\n",
-			    __FUNCTION__, lists_dir);
-	       free(lists_dir);
-	       return EINVAL;
-	  }
-	  err = file_mkdir_hier(lists_dir, 0755);
-	  if (err) {
-	       ipkg_message(conf, IPKG_ERROR,
-			    "%s: ERROR: failed to make directory %s: %s\n",
-			    __FUNCTION__, lists_dir, strerror(errno));
-	       free(lists_dir);
-	       return EINVAL;
-	  }	
-     } 
-
-     failures = 0;
-     for (iter = conf->pkg_src_list.head; iter; iter = iter->next) {
-	  char *url, *list_file_name;
-
-	  src = iter->data;
-
-	  if (src->extra_data)	/* debian style? */
-	      sprintf_alloc(&url, "%s/%s/%s", src->value, src->extra_data, 
-			    src->gzip ? "Packages.gz" : "Packages");
-	  else
-	      sprintf_alloc(&url, "%s/%s", src->value, src->gzip ? "Packages.gz" : "Packages");
-
-	  sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
-	  if (src->gzip) {
-	      char *tmp;
-	      char *tmp_file_name;
-	      FILE *in, *out;
-
-	      tmp = strdup ("/tmp/ipkg.XXXXXX");
-
-	      if (mkdtemp (tmp) == NULL) {
-		  perror ("mkdtemp");
-		  failures++;
-		  continue;
-	      }
-	      
-	      sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
-	      err = ipkg_download(conf, url, tmp_file_name);
-	      if (err == 0) {
-		   ipkg_message (conf, IPKG_NOTICE, "Inflating %s\n", url);
-		   in = fopen (tmp_file_name, "r");
-		   out = fopen (list_file_name, "w");
-		   if (in && out)
-			unzip (in, out);
-		   else
-			err = 1;
-		   if (in)
-			fclose (in);
-		   if (out)
-			fclose (out);
-		   unlink (tmp_file_name);
-		   rmdir (tmp);
-		   free (tmp);
-	      }
-	  } else
-	      err = ipkg_download(conf, url, list_file_name);
-	  if (err) {
-	       failures++;
-	  } else {
-	       ipkg_message(conf, IPKG_NOTICE,
-			    "Updated list of available packages in %s\n",
-			    list_file_name);
-	  }
-	  free(url);
-	  free(list_file_name);
-     }
-     free(lists_dir);
-
-#ifdef CONFIG_CLEAR_SW_INSTALL_FLAG
-#warning here
-     /* clear SW_INSTALL on any package where state is SS_NOT_INSTALLED.
-      * this is a hack to work around poor bookkeeping in old ipkg upgrade code 
-      * -Jamey 3/1/03
-      */
-     {
-	  int i;
-	  int changed = 0;
-	  pkg_vec_t *available = pkg_vec_alloc();
-	  pkg_hash_fetch_available(&conf->pkg_hash, available);
-	  ipkg_message(conf, IPKG_DEBUG, "Clearing SW_INSTALL for SS_NOT_INSTALLED packages.\n");
-	  for (i = 0; i < available->len; i++) {
-	       pkg_t *pkg = available->pkgs[i];
-	       if (pkg->state_want == SW_INSTALL && pkg->state_status == SS_NOT_INSTALLED) {
-		    ipkg_message(conf, IPKG_DEBUG, "Clearing SW_INSTALL on package %s.\n", pkg->name);
-		    pkg->state_want = SW_UNKNOWN;
-		    changed = 1;
-	       }
-	  }
-	  pkg_vec_free(available);
-	  if (changed) {
-	       write_status_files_if_changed(conf);
-	  }
-     }
-#endif
-
-     return failures;
-}
-
-
-/* scan the args passed and cache the local filenames of the packages */
-int ipkg_multiple_files_scan(ipkg_conf_t *conf, int argc, char **argv)
-{
-     int i;
-     int err;
-    
-     /* 
-      * First scan through package names/urls
-      * For any urls, download the packages and install in database.
-      * For any files, install package info in database.
-      */
-     for (i = 0; i < argc; i ++) {
-	  char *filename = argv [i];
-	  //char *tmp = basename (tmp);
-	  //int tmplen = strlen (tmp);
-
-	  //if (strcmp (tmp + (tmplen - strlen (IPKG_PKG_EXTENSION)), IPKG_PKG_EXTENSION) != 0)
-	  //     continue;
-	  //if (strcmp (tmp + (tmplen - strlen (DPKG_PKG_EXTENSION)), DPKG_PKG_EXTENSION) != 0)
-	  //     continue;
-	
-          ipkg_message(conf, IPKG_DEBUG2, "Debug mfs: %s  \n",filename );
-
-	  err = ipkg_prepare_url_for_install(conf, filename, &argv[i]);
-	  if (err)
-	    return err;
-     }
-     return 0;
-}
-
-struct ipkg_intercept
-{
-    char *oldpath;
-    char *statedir;
-};
-
-typedef struct ipkg_intercept *ipkg_intercept_t;
-
-ipkg_intercept_t ipkg_prep_intercepts(ipkg_conf_t *conf)
-{
-    ipkg_intercept_t ctx;
-    char *newpath;
-    int gen;
-
-    ctx = malloc (sizeof (*ctx));
-    ctx->oldpath = strdup (getenv ("PATH"));
-
-    sprintf_alloc (&newpath, "%s/ipkg/intercept:%s", DATADIR, ctx->oldpath);
-    setenv ("PATH", newpath, 1);
-    free (newpath);
-    
-    gen = 0;
- retry:
-    sprintf_alloc (&ctx->statedir, "/tmp/ipkg-intercept-%d-%d", getpid (), gen);
-    if (mkdir (ctx->statedir, 0770) < 0) {
-	if (errno == EEXIST) {
-	    free (ctx->statedir);
-	    gen++;
-	    goto retry;
-	}
-	perror (ctx->statedir);
-	return NULL;
-    }
-    setenv ("IPKG_INTERCEPT_DIR", ctx->statedir, 1);
-    return ctx;
-}
-
-int ipkg_finalize_intercepts(ipkg_intercept_t ctx)
-{
-    char *cmd;
-    DIR *dir;
-    int err = 0;
-
-    setenv ("PATH", ctx->oldpath, 1);
-    free (ctx->oldpath);
-
-    dir = opendir (ctx->statedir);
-    if (dir) {
-	struct dirent *de;
-	while (de = readdir (dir), de != NULL) {
-	    char *path;
-	    
-	    if (de->d_name[0] == '.')
-		continue;
-	    
-	    sprintf_alloc (&path, "%s/%s", ctx->statedir, de->d_name);
-	    if (access (path, X_OK) == 0) {
-		if (system (path)) {
-		    err = errno;
-		    perror (de->d_name);
-		}
-	    }
-	    free (path);
-	}
-    } else
-	perror (ctx->statedir);
-	
-    sprintf_alloc (&cmd, "rm -rf %s", ctx->statedir);
-    system (cmd);
-    free (cmd);
-
-    free (ctx->statedir);
-    free (ctx);
-
-    return err;
-}
-
-int ipkg_configure_packages(ipkg_conf_t *conf, char *pkg_name)
-{
-     pkg_vec_t *all;
-     int i;
-     pkg_t *pkg;
-     ipkg_intercept_t ic;
-     int r, err = 0;
-
-     ipkg_message(conf, IPKG_INFO,
-		  "Configuring unpacked packages\n");
-     fflush( stdout );
-
-     all = pkg_vec_alloc();
-     pkg_hash_fetch_available(&conf->pkg_hash, all);
-
-     ic = ipkg_prep_intercepts (conf);
-    
-     for(i = 0; i < all->len; i++) {
-	  pkg = all->pkgs[i];
-
-	  if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) 
-	       continue;
-
-	  if (pkg->state_status == SS_UNPACKED) {
-	       ipkg_message(conf, IPKG_NOTICE,
-			    "Configuring %s\n", pkg->name);
-	       fflush( stdout );
-	       r = ipkg_configure(conf, pkg);
-	       if (r == 0) {
-		    pkg->state_status = SS_INSTALLED;
-		    pkg->parent->state_status = SS_INSTALLED;
-		    pkg->state_flag &= ~SF_PREFER;
-	       } else {
-		    if (!err)
-			err = r;
-	       }
-	  }
-     }
-
-     r = ipkg_finalize_intercepts (ic);
-     if (r && !err)
-	 err = r;
-
-     pkg_vec_free(all);
-     return err;
-}
-
-static ipkg_conf_t *global_conf;
-
-static void sigint_handler(int sig)
-{
-     signal(sig, SIG_DFL);
-     ipkg_message(NULL, IPKG_NOTICE,
-		  "ipkg: interrupted. writing out status database\n");
-     write_status_files_if_changed(global_conf);
-     exit(128 + sig);
-}
-
-static int ipkg_install_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     int i;
-     char *arg;
-     int err=0;
-
-     global_conf = conf;
-     signal(SIGINT, sigint_handler);
-
-     /*
-      * Now scan through package names and install
-      */
-     for (i=0; i < argc; i++) {
-	  arg = argv[i];
-
-          ipkg_message(conf, IPKG_DEBUG2, "Debug install_cmd: %s  \n",arg );
-          err = ipkg_prepare_url_for_install(conf, arg, &argv[i]);
-          if (err != EINVAL && err != 0)
-              return err;
-     }
-     pkg_info_preinstall_check(conf);
-
-     for (i=0; i < argc; i++) {
-	  arg = argv[i];
-	  if (conf->multiple_providers)
-	       err = ipkg_install_multi_by_name(conf, arg);
-	  else{
-	       err = ipkg_install_by_name(conf, arg);
-          }
-	  if (err == IPKG_PKG_HAS_NO_CANDIDATE) {
-	       ipkg_message(conf, IPKG_ERROR,
-			    "Cannot find package %s.\n"
-			    "Check the spelling or perhaps run 'ipkg update'\n",
-			    arg);
-	  }
-     }
-
-     /* recheck to verify that all dependences are satisfied */
-     if (0) ipkg_satisfy_all_dependences(conf);
-
-     ipkg_configure_packages(conf, NULL);
-
-     write_status_files_if_changed(conf);
-
-     return err;
-}
-
-static int ipkg_upgrade_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     int i;
-     pkg_t *pkg;
-     int err;
-
-     global_conf = conf;
-     signal(SIGINT, sigint_handler);
-
-     if (argc) {
-	  for (i=0; i < argc; i++) {
-	       char *arg = argv[i];
-
-               err = ipkg_prepare_url_for_install(conf, arg, &arg);
-               if (err != EINVAL && err != 0)
-                   return err;
-	  }
-	  pkg_info_preinstall_check(conf);
-
-	  for (i=0; i < argc; i++) {
-	       char *arg = argv[i];
-	       if (conf->restrict_to_default_dest) {
-		    pkg = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash,
-								argv[i],
-								conf->default_dest);
-		    if (pkg == NULL) {
-			 ipkg_message(conf, IPKG_NOTICE,
-				      "Package %s not installed in %s\n",
-				      argv[i], conf->default_dest->name);
-			 continue;
-		    }
-	       } else {
-		    pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash,
-							   argv[i]);
-	       }
-	       if (pkg)
-		    ipkg_upgrade_pkg(conf, pkg);
-	       else {
-		    ipkg_install_by_name(conf, arg);
-               }
-	  }
-     } else {
-	  pkg_vec_t *installed = pkg_vec_alloc();
-
-	  pkg_info_preinstall_check(conf);
-
-	  pkg_hash_fetch_all_installed(&conf->pkg_hash, installed);
-	  for (i = 0; i < installed->len; i++) {
-	       pkg = installed->pkgs[i];
-	       ipkg_upgrade_pkg(conf, pkg);
-	  }
-	  pkg_vec_free(installed);
-     }
-
-     /* recheck to verify that all dependences are satisfied */
-     if (0) ipkg_satisfy_all_dependences(conf);
-
-     ipkg_configure_packages(conf, NULL);
-
-     write_status_files_if_changed(conf);
-
-     return 0;
-}
-
-static int ipkg_download_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     int i, err;
-     char *arg;
-     pkg_t *pkg;
-
-     pkg_info_preinstall_check(conf);
-     for (i = 0; i < argc; i++) {
-	  arg = argv[i];
-
-	  pkg = pkg_hash_fetch_best_installation_candidate_by_name(conf, arg);
-	  if (pkg == NULL) {
-	       ipkg_message(conf, IPKG_ERROR,
-			    "Cannot find package %s.\n"
-			    "Check the spelling or perhaps run 'ipkg update'\n",
-			    arg);
-	       continue;
-	  }
-
-	  err = ipkg_download_pkg(conf, pkg, ".");
-
-	  if (err) {
-	       ipkg_message(conf, IPKG_ERROR,
-			    "Failed to download %s\n", pkg->name);
-	  } else {
-	       ipkg_message(conf, IPKG_NOTICE,
-			    "Downloaded %s as %s\n",
-			    pkg->name, pkg->local_filename);
-	  }
-     }
-
-     return 0;
-}
-
-
-static int ipkg_list_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     int i ;
-     pkg_vec_t *available;
-     pkg_t *pkg;
-     char desc_short[IPKG_LIST_DESCRIPTION_LENGTH];
-     char *newline;
-     char *pkg_name = NULL;
-     char *version_str;
-
-     if (argc > 0) {
-	  pkg_name = argv[0];
-     }
-     available = pkg_vec_alloc();
-     pkg_hash_fetch_available(&conf->pkg_hash, available);
-     for (i=0; i < available->len; i++) {
-	  pkg = available->pkgs[i];
-	  /* if we have package name or pattern and pkg does not match, then skip it */
-	  if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) 
-	       continue;
-	  if (pkg->description) {
-	       strncpy(desc_short, pkg->description, IPKG_LIST_DESCRIPTION_LENGTH);
-	  } else {
-	       desc_short[0] = '\0';
-	  }
-	  desc_short[IPKG_LIST_DESCRIPTION_LENGTH - 1] = '\0';
-	  newline = strchr(desc_short, '\n');
-	  if (newline) {
-	       *newline = '\0';
-	  }
-#ifndef IPKG_LIB
-	  printf("%s - %s\n", pkg->name, desc_short);
-#else
-	  if (ipkg_cb_list) {
-	  	version_str = pkg_version_str_alloc(pkg);
-	  	ipkg_cb_list(pkg->name,desc_short,
-		                             version_str,
-	                                 pkg->state_status,
-	                                 p_userdata);
-		free(version_str);
-	  }
-#endif
-     }
-     pkg_vec_free(available);
-
-     return 0;
-}
-
-
-static int ipkg_list_installed_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     int i ;
-     pkg_vec_t *available;
-     pkg_t *pkg;
-     char desc_short[IPKG_LIST_DESCRIPTION_LENGTH];
-     char *newline;
-     char *pkg_name = NULL;
-     char *version_str;
-
-     if (argc > 0) {
-	  pkg_name = argv[0];
-     }
-     available = pkg_vec_alloc();
-     pkg_hash_fetch_all_installed(&conf->pkg_hash, available);
-     for (i=0; i < available->len; i++) {
-	  pkg = available->pkgs[i];
-	  /* if we have package name or pattern and pkg does not match, then skip it */
-	  if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) 
-	       continue;
-	  if (pkg->description) {
-	       strncpy(desc_short, pkg->description, IPKG_LIST_DESCRIPTION_LENGTH);
-	  } else {
-	       desc_short[0] = '\0';
-	  }
-	  desc_short[IPKG_LIST_DESCRIPTION_LENGTH - 1] = '\0';
-	  newline = strchr(desc_short, '\n');
-	  if (newline) {
-	       *newline = '\0';
-	  }
-#ifndef IPKG_LIB
-	  printf("%s - %s\n", pkg->name, desc_short);
-#else
-	  if (ipkg_cb_list) {
-	  	version_str = pkg_version_str_alloc(pkg);
-	  	ipkg_cb_list(pkg->name,desc_short,
-		                             version_str,
-	                                 pkg->state_status,
-	                                 p_userdata);
-		free(version_str);
-	  }
-#endif
-     }
-
-     return 0;
-}
-
-static int ipkg_info_status_cmd(ipkg_conf_t *conf, int argc, char **argv, int installed_only)
-{
-     int i;
-     pkg_vec_t *available;
-     pkg_t *pkg;
-     char *pkg_name = NULL;
-     char **pkg_fields = NULL;
-     int n_fields = 0;
-     char *buff ; // = (char *)malloc(1);
-
-     if (argc > 0) {
-	  pkg_name = argv[0];
-     }
-     if (argc > 1) {
-	  pkg_fields = &argv[1];
-	  n_fields = argc - 1;
-     }
-
-     available = pkg_vec_alloc();
-     if (installed_only)
-	  pkg_hash_fetch_all_installed(&conf->pkg_hash, available);
-     else
-	  pkg_hash_fetch_available(&conf->pkg_hash, available);
-     for (i=0; i < available->len; i++) {
-	  pkg = available->pkgs[i];
-	  if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) {
-	       continue;
-	  }
-#ifndef IPKG_LIB
-	  if (n_fields) {
-	       for (j = 0; j < n_fields; j++)
-		    pkg_print_field(pkg, stdout, pkg_fields[j]);
-	  } else {
-	       pkg_print_info(pkg, stdout);
-	  }
-#else
-
-	  buff = pkg_formatted_info(pkg);
-          if ( buff ) {
-	       if (ipkg_cb_status) ipkg_cb_status(pkg->name,
-						  pkg->state_status,
-						  buff,
-						  p_userdata);
-/* 
-   We should not forget that actually the pointer is allocated. 
-   We need to free it :)  ( Thanks florian for seeing the error )
-*/
-               free(buff);
-          }
-#endif
-	  if (conf->verbosity > 1) {
-	       conffile_list_elt_t *iter;
-	       for (iter = pkg->conffiles.head; iter; iter = iter->next) {
-		    conffile_t *cf = iter->data;
-		    int modified = conffile_has_been_modified(conf, cf);
-		    ipkg_message(conf, IPKG_NOTICE, "conffile=%s md5sum=%s modified=%d\n",
-				 cf->name, cf->value, modified);
-	       }
-	  }
-     }
-#ifndef IPKG_LIB
-     if (buff)
-	  free(buff);
-#endif
-     pkg_vec_free(available);
-
-     return 0;
-}
-
-static int ipkg_info_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_info_status_cmd(conf, argc, argv, 0);
-}
-
-static int ipkg_status_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_info_status_cmd(conf, argc, argv, 1);
-}
-
-static int ipkg_configure_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     
-     int err;
-     if (argc > 0) {
-	  char *pkg_name = NULL;
-
-	  pkg_name = argv[0];
-
-	  err = ipkg_configure_packages (conf, pkg_name);
-     
-     } else {
-	  err = ipkg_configure_packages (conf, NULL);
-     }
-
-     write_status_files_if_changed(conf);
-
-     return err;
-}
-
-static int ipkg_install_pending_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     int i, err;
-     char *globpattern;
-     glob_t globbuf;
-    
-     sprintf_alloc(&globpattern, "%s/*" IPKG_PKG_EXTENSION, conf->pending_dir);
-     err = glob(globpattern, 0, NULL, &globbuf);
-     free(globpattern);
-     if (err) {
-	  return 0;
-     }
-
-     ipkg_message(conf, IPKG_NOTICE,
-		  "The following packages in %s will now be installed.\n",
-		  conf->pending_dir);
-     for (i = 0; i < globbuf.gl_pathc; i++) {
-	  ipkg_message(conf, IPKG_NOTICE,
-		       "%s%s", i == 0 ? "" : " ", globbuf.gl_pathv[i]);
-     }
-     ipkg_message(conf, IPKG_NOTICE, "\n");
-     for (i = 0; i < globbuf.gl_pathc; i++) {
-	  err = ipkg_install_from_file(conf, globbuf.gl_pathv[i]);
-	  if (err == 0) {
-	       err = unlink(globbuf.gl_pathv[i]);
-	       if (err) {
-		    ipkg_message(conf, IPKG_ERROR,
-				 "%s: ERROR: failed to unlink %s: %s\n",
-				 __FUNCTION__, globbuf.gl_pathv[i], strerror(err));
-		    return err;
-	       }
-	  }
-     }
-     globfree(&globbuf);
-
-     return err;
-}
-
-static int ipkg_remove_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     int i,a,done;
-     pkg_t *pkg;
-     pkg_t *pkg_to_remove;
-     pkg_vec_t *available;
-     char *pkg_name = NULL;
-     global_conf = conf;
-     signal(SIGINT, sigint_handler);
-
-// ENH: Add the "no pkg removed" just in case.
-
-    done = 0;
-
-     available = pkg_vec_alloc();
-     pkg_info_preinstall_check(conf);
-     if ( argc > 0 ) {
-        pkg_hash_fetch_all_installed(&conf->pkg_hash, available);
-        for (i=0; i < argc; i++) {
-           pkg_name = malloc(strlen(argv[i])+2);
-           strcpy(pkg_name,argv[i]);
-           for (a=0; a < available->len; a++) {
-               pkg = available->pkgs[a];
-	       if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) {
-                  continue;
-               }
-               if (conf->restrict_to_default_dest) {
-	            pkg_to_remove = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash,
-							        pkg->name,
-							        conf->default_dest);
-               } else {
-	            pkg_to_remove = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg->name );
-               }
-        
-               if (pkg == NULL) {
-	            ipkg_message(conf, IPKG_ERROR, "Package %s is not installed.\n", pkg->name);
-	            continue;
-               }
-               if (pkg->state_status == SS_NOT_INSTALLED) {    // Added the control, so every already removed package could be skipped
-	            ipkg_message(conf, IPKG_ERROR, "Package seems to be %s not installed (STATUS = NOT_INSTALLED).\n", pkg->name);
-                    continue;
-               }
-               ipkg_remove_pkg(conf, pkg_to_remove,0);
-               done = 1;
-           }
-           free (pkg_name);
-        }
-        pkg_vec_free(available);
-     } else {
-	  pkg_vec_t *installed_pkgs = pkg_vec_alloc();
-	  int i;
-	  int flagged_pkg_count = 0;
-	  int removed;
-
-	  pkg_hash_fetch_all_installed(&conf->pkg_hash, installed_pkgs);
-
-	  for (i = 0; i < installed_pkgs->len; i++) {
-	       pkg_t *pkg = installed_pkgs->pkgs[i];
-	       if (pkg->state_flag & SF_USER) {
-		    flagged_pkg_count++;
-	       } else {
-		    if (!pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL))
-			 ipkg_message(conf, IPKG_NOTICE, "Non-user leaf package: %s\n", pkg->name);
-	       }
-	  }
-	  if (!flagged_pkg_count) {
-	       ipkg_message(conf, IPKG_NOTICE, "No packages flagged as installed by user, \n"
-			    "so refusing to uninstall unflagged non-leaf packages\n");
-	       return 0;
-	  }
-
-	  /* find packages not flagged SF_USER (i.e., installed to
-	   * satisfy a dependence) and not having any dependents, and
-	   * remove them */
-	  do {
-	       removed = 0;
-	       for (i = 0; i < installed_pkgs->len; i++) {
-		    pkg_t *pkg = installed_pkgs->pkgs[i];
-		    if (!(pkg->state_flag & SF_USER)
-			&& !pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL)) {
-			 removed++;
-			 ipkg_message(conf, IPKG_NOTICE, "Removing non-user leaf package %s\n");
-			 ipkg_remove_pkg(conf, pkg,0);
-                         done = 1;
-		    }
-	       }
-	  } while (removed);
-	  pkg_vec_free(installed_pkgs);
-     }
-
-     if ( done == 0 ) 
-        ipkg_message(conf, IPKG_NOTICE, "No packages removed.\n");
-
-     write_status_files_if_changed(conf);
-     return 0;
-}
-
-static int ipkg_purge_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     int i;
-     pkg_t *pkg;
-
-     global_conf = conf;
-     signal(SIGINT, sigint_handler);
-
-     pkg_info_preinstall_check(conf);
-
-     for (i=0; i < argc; i++) {
-	  if (conf->restrict_to_default_dest) {
-	       pkg = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash,
-							   argv[i],
-							   conf->default_dest);
-	  } else {
-	       pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, argv[i]);
-	  }
-
-	  if (pkg == NULL) {
-	       ipkg_message(conf, IPKG_ERROR,
-			    "Package %s is not installed.\n", argv[i]);
-	       continue;
-	  }
-	  ipkg_purge_pkg(conf, pkg);
-     }
-
-     write_status_files_if_changed(conf);
-     return 0;
-}
-
-static int ipkg_flag_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     int i;
-     pkg_t *pkg;
-     const char *flags = argv[0];
-    
-     global_conf = conf;
-     signal(SIGINT, sigint_handler);
-
-     for (i=1; i < argc; i++) {
-	  if (conf->restrict_to_default_dest) {
-	       pkg = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash,
-							   argv[i],
-							   conf->default_dest);
-	  } else {
-	       pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, argv[i]);
-	  }
-
-	  if (pkg == NULL) {
-	       ipkg_message(conf, IPKG_ERROR,
-			    "Package %s is not installed.\n", argv[i]);
-	       continue;
-	  }
-          if (( strcmp(flags,"hold")==0)||( strcmp(flags,"noprune")==0)||
-              ( strcmp(flags,"user")==0)||( strcmp(flags,"ok")==0)) {
-	      pkg->state_flag = pkg_state_flag_from_str(flags);
-          }
-/* pb_ asked this feature 03292004 */
-/* Actually I will use only this two, but this is an open for various status */
-          if (( strcmp(flags,"installed")==0)||( strcmp(flags,"unpacked")==0)){
-	      pkg->state_status = pkg_state_status_from_str(flags);
-          }
-	  ipkg_state_changed++;
-	  ipkg_message(conf, IPKG_NOTICE,
-		       "Setting flags for package %s to %s\n",
-		       pkg->name, flags);
-     }
-
-     write_status_files_if_changed(conf);
-     return 0;
-}
-
-static int ipkg_files_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     pkg_t *pkg;
-     str_list_t *installed_files;
-     str_list_elt_t *iter;
-     char *pkg_version;
-     size_t buff_len = 8192;
-     size_t used_len;
-     char *buff ;
-
-     buff = (char *)malloc(buff_len);
-     if ( buff == NULL ) {
-        fprintf( stderr,"%s: Unable to allocate memory \n",__FUNCTION__);
-        return ENOMEM;
-     }
- 
-     if (argc < 1) {
-	  return EINVAL;
-     }
-
-     pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash,
-					    argv[0]);
-     if (pkg == NULL) {
-	  ipkg_message(conf, IPKG_ERROR,
-		       "Package %s not installed.\n", argv[0]);
-	  return 0;
-     }
-
-     installed_files = pkg_get_installed_files(pkg);
-     pkg_version = pkg_version_str_alloc(pkg);
-
-#ifndef IPKG_LIB
-     printf("Package %s (%s) is installed on %s and has the following files:\n",
-	    pkg->name, pkg_version, pkg->dest->name);
-     for (iter = installed_files->head; iter; iter = iter->next) {
-	  puts(iter->data);
-     }
-#else
-     if (buff) {
-     try_again:
-	  used_len = snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n",
-			      pkg->name, pkg_version, pkg->dest->name) + 1;
-	  if (used_len > buff_len) {
-	       buff_len *= 2;
-	       buff = realloc (buff, buff_len);
-	       goto try_again;
-	  }
-	  for (iter = installed_files->head; iter; iter = iter->next) {
-	       used_len += strlen (iter->data) + 1;
-	       while (buff_len <= used_len) {
-		    buff_len *= 2;
-		    buff = realloc (buff, buff_len);
-	       }
-	       strncat(buff, iter->data, buff_len);
-	       strncat(buff, "\n", buff_len);
-	  } 
-	  if (ipkg_cb_list) ipkg_cb_list(pkg->name,
-					 buff,
-					 pkg_version_str_alloc(pkg),
-					 pkg->state_status,
-					 p_userdata);
-	  free(buff);
-     }
-#endif
-
-     free(pkg_version);
-     pkg_free_installed_files(pkg);
-
-     return 0;
-}
-
-static int ipkg_depends_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-
-     if (argc > 0) {
-	  pkg_vec_t *available_pkgs = pkg_vec_alloc();
-	  const char *rel_str = "depends on";
-	  int i;
-     
-	  pkg_info_preinstall_check(conf);
-
-	  if (conf->query_all)
-	       pkg_hash_fetch_available(&conf->pkg_hash, available_pkgs);
-	  else
-	       pkg_hash_fetch_all_installed(&conf->pkg_hash, available_pkgs);
-	  for (i = 0; i < argc; i++) {
-	       const char *target = argv[i];
-	       int j;
-
-	       ipkg_message(conf, IPKG_ERROR, "target=%s\n", target);
-
-	       for (j = 0; j < available_pkgs->len; j++) {
-		    pkg_t *pkg = available_pkgs->pkgs[j];
-		    if (fnmatch(target, pkg->name, 0) == 0) {
-			 int k;
-			 int count = pkg->depends_count + pkg->pre_depends_count;
-			 ipkg_message(conf, IPKG_ERROR, "What %s (arch=%s) %s\n",
-				      target, pkg->architecture, rel_str);
-			 for (k = 0; k < count; k++) {
-			      compound_depend_t *cdepend = &pkg->depends[k];
-			      int l;
-			      for (l = 0; l < cdepend->possibility_count; l++) {
-				   depend_t *possibility = cdepend->possibilities[l];
-				   ipkg_message(conf, IPKG_ERROR, "    %s", possibility->pkg->name);
-				   if (conf->verbosity > 0) {
-					// char *ver = abstract_pkg_version_str_alloc(possibility->pkg); 
-					ipkg_message(conf, IPKG_NOTICE, " %s", possibility->version);
-					if (possibility->version) {
-					     char *typestr = NULL;
-					     switch (possibility->constraint) {
-					     case NONE: typestr = "none"; break;
-					     case EARLIER: typestr = "<"; break;
-					     case EARLIER_EQUAL: typestr = "<="; break;
-					     case EQUAL: typestr = "="; break;
-					     case LATER_EQUAL: typestr = ">="; break;
-					     case LATER: typestr = ">"; break;
-					     }
-					     ipkg_message(conf, IPKG_NOTICE, " (%s %s)", typestr, possibility->version);
-					}
-					// free(ver);
-				   }
-				   ipkg_message(conf, IPKG_ERROR, "\n");
-			      }
-			 }
-		    }
-	       }
-	  }
-	  pkg_vec_free(available_pkgs);
-     }
-     return 0;
-}
-
-enum what_field_type {
-  WHATDEPENDS,
-  WHATCONFLICTS,
-  WHATPROVIDES,
-  WHATREPLACES,
-  WHATRECOMMENDS,
-  WHATSUGGESTS
-};
-
-static int ipkg_what_depends_conflicts_cmd(ipkg_conf_t *conf, enum what_field_type what_field_type, int recursive, int argc, char **argv)
-{
-
-     if (argc > 0) {
-	  pkg_vec_t *available_pkgs = pkg_vec_alloc();
-	  const char *rel_str = NULL;
-	  int i;
-	  int changed;
-
-	  switch (what_field_type) {
-	  case WHATDEPENDS: rel_str = "depends on"; break;
-	  case WHATCONFLICTS: rel_str = "conflicts with"; break;
-	  case WHATSUGGESTS: rel_str = "suggests"; break;
-	  case WHATRECOMMENDS: rel_str = "recommends"; break;
-	  case WHATPROVIDES: rel_str = "provides"; break;
-	  case WHATREPLACES: rel_str = "replaces"; break;
-	  }
-     
-	  if (conf->query_all)
-	       pkg_hash_fetch_available(&conf->pkg_hash, available_pkgs);
-	  else
-	       pkg_hash_fetch_all_installed(&conf->pkg_hash, available_pkgs);
-
-	  /* mark the root set */
-	  pkg_vec_clear_marks(available_pkgs);
-	  ipkg_message(conf, IPKG_NOTICE, "Root set:\n");
-	  for (i = 0; i < argc; i++) {
-	       const char *dependee_pattern = argv[i];
-	       pkg_vec_mark_if_matches(available_pkgs, dependee_pattern);
-	  }
-	  for (i = 0; i < available_pkgs->len; i++) {
-	       pkg_t *pkg = available_pkgs->pkgs[i];
-	       if (pkg->state_flag & SF_MARKED) {
-		    /* mark the parent (abstract) package */
-		    pkg_mark_provides(pkg);
-		    ipkg_message(conf, IPKG_NOTICE, "  %s\n", pkg->name);
-	       }
-	  }
-
-	  ipkg_message(conf, IPKG_NOTICE, "What %s root set\n", rel_str);
-	  do {
-	       int j;
-	       changed = 0;
-
-	       for (j = 0; j < available_pkgs->len; j++) {
-		    pkg_t *pkg = available_pkgs->pkgs[j];
-		    int k;
-		    int count = ((what_field_type == WHATCONFLICTS)
-				 ? pkg->conflicts_count
-				 : pkg->pre_depends_count + pkg->depends_count + pkg->recommends_count + pkg->suggests_count);
-		    /* skip this package if it is already marked */
-		    if (pkg->parent->state_flag & SF_MARKED) {
-			 continue;
-		    }
-		    for (k = 0; k < count; k++) {
-			 compound_depend_t *cdepend = 
-			      (what_field_type == WHATCONFLICTS) ? &pkg->conflicts[k] : &pkg->depends[k];
-			 int l;
-			 for (l = 0; l < cdepend->possibility_count; l++) {
-			      depend_t *possibility = cdepend->possibilities[l];
-			      if (possibility->pkg->state_flag & SF_MARKED) {
-				   /* mark the depending package so we won't visit it again */
-				   pkg->state_flag |= SF_MARKED;
-				   pkg_mark_provides(pkg);
-				   changed++;
-
-				   ipkg_message(conf, IPKG_NOTICE, "    %s", pkg->name);
-				   if (conf->verbosity > 0) {
-					char *ver = pkg_version_str_alloc(pkg); 
-					ipkg_message(conf, IPKG_NOTICE, " %s", ver);
-					ipkg_message(conf, IPKG_NOTICE, "\t%s %s", rel_str, possibility->pkg->name);
-					if (possibility->version) {
-					     char *typestr = NULL;
-					     switch (possibility->constraint) {
-					     case NONE: typestr = "none"; break;
-					     case EARLIER: typestr = "<"; break;
-					     case EARLIER_EQUAL: typestr = "<="; break;
-					     case EQUAL: typestr = "="; break;
-					     case LATER_EQUAL: typestr = ">="; break;
-					     case LATER: typestr = ">"; break;
-					     }
-					     ipkg_message(conf, IPKG_NOTICE, " (%s %s)", typestr, possibility->version);
-					}
-					free(ver);
-					if (!pkg_dependence_satisfiable(conf, possibility))
-					     ipkg_message(conf, IPKG_NOTICE, " unsatisfiable");
-				   }
-				   ipkg_message(conf, IPKG_NOTICE, "\n");
-				   goto next_package;
-			      }
-			 }
-		    }
-	       next_package:
-		    ;
-	       }
-	  } while (changed && recursive);
-	  pkg_vec_free(available_pkgs);
-     }
-
-     return 0;
-}
-
-int pkg_mark_provides(pkg_t *pkg)
-{
-     int provides_count = pkg->provides_count;
-     abstract_pkg_t **provides = pkg->provides;
-     int i;
-     pkg->parent->state_flag |= SF_MARKED;
-     for (i = 0; i < provides_count; i++) {
-	  provides[i]->state_flag |= SF_MARKED;
-     }
-     return 0;
-}
-
-static int ipkg_whatdepends_recursively_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_depends_conflicts_cmd(conf, WHATDEPENDS, 1, argc, argv);
-}
-static int ipkg_whatdepends_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_depends_conflicts_cmd(conf, WHATDEPENDS, 0, argc, argv);
-}
-
-static int ipkg_whatsuggests_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_depends_conflicts_cmd(conf, WHATSUGGESTS, 0, argc, argv);
-}
-
-static int ipkg_whatrecommends_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_depends_conflicts_cmd(conf, WHATRECOMMENDS, 0, argc, argv);
-}
-
-static int ipkg_whatconflicts_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_depends_conflicts_cmd(conf, WHATCONFLICTS, 0, argc, argv);
-}
-
-static int ipkg_what_provides_replaces_cmd(ipkg_conf_t *conf, enum what_field_type what_field_type, int argc, char **argv)
-{
-
-     if (argc > 0) {
-	  pkg_vec_t *available_pkgs = pkg_vec_alloc();
-	  const char *rel_str = (what_field_type == WHATPROVIDES ? "provides" : "replaces");
-	  int i;
-     
-	  pkg_info_preinstall_check(conf);
-
-	  if (conf->query_all)
-	       pkg_hash_fetch_available(&conf->pkg_hash, available_pkgs);
-	  else
-	       pkg_hash_fetch_all_installed(&conf->pkg_hash, available_pkgs);
-	  for (i = 0; i < argc; i++) {
-	       const char *target = argv[i];
-	       int j;
-
-	       ipkg_message(conf, IPKG_ERROR, "What %s %s\n",
-			    rel_str, target);
-	       for (j = 0; j < available_pkgs->len; j++) {
-		    pkg_t *pkg = available_pkgs->pkgs[j];
-		    int k;
-		    int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count : pkg->replaces_count;
-		    for (k = 0; k < count; k++) {
-			 abstract_pkg_t *apkg = 
-			      ((what_field_type == WHATPROVIDES) 
-			       ? pkg->provides[k]
-			       : pkg->replaces[k]);
-			 if (fnmatch(target, apkg->name, 0) == 0) {
-			      ipkg_message(conf, IPKG_ERROR, "    %s", pkg->name);
-			      if (strcmp(target, apkg->name) != 0)
-				   ipkg_message(conf, IPKG_ERROR, "\t%s %s\n", rel_str, apkg->name);
-			      ipkg_message(conf, IPKG_ERROR, "\n");
-			 }
-		    }
-	       }
-	  }
-	  pkg_vec_free(available_pkgs);
-     }
-     return 0;
-}
-
-static int ipkg_whatprovides_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_provides_replaces_cmd(conf, WHATPROVIDES, argc, argv);
-}
-
-static int ipkg_whatreplaces_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     return ipkg_what_provides_replaces_cmd(conf, WHATREPLACES, argc, argv);
-}
-
-static int ipkg_search_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     int i;
-
-     pkg_vec_t *installed;
-     pkg_t *pkg;
-     str_list_t *installed_files;
-     str_list_elt_t *iter;
-     char *installed_file;
-
-     if (argc < 1) {
-	  return EINVAL;
-     }
- 
-     installed = pkg_vec_alloc();
-     pkg_hash_fetch_all_installed(&conf->pkg_hash, installed);
-
-     for (i=0; i < installed->len; i++) {
-	  pkg = installed->pkgs[i];
-
-	  installed_files = pkg_get_installed_files(pkg);
-
-	  for (iter = installed_files->head; iter; iter = iter->next) {
-	       installed_file = iter->data;
-	       if (fnmatch(argv[0], installed_file, 0)==0)  {
-#ifndef IPKG_LIB
-		    printf("%s: %s\n", pkg->name, installed_file);
-#else
-			if (ipkg_cb_list) ipkg_cb_list(pkg->name, 
-						       installed_file, 
-			                               pkg_version_str_alloc(pkg), 
-			                               pkg->state_status, p_userdata);
-#endif			   
-	       }		
-	  }
-
-	  pkg_free_installed_files(pkg);
-     }
-
-     /* XXX: CLEANUP: It's not obvious from the name of
-	pkg_hash_fetch_all_installed that we need to call
-	pkg_vec_free to avoid a memory leak. */
-     pkg_vec_free(installed);
-
-     return 0;
-}
-
-static int ipkg_compare_versions_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     if (argc == 3) {
-	  /* this is a bit gross */
-	  struct pkg p1, p2;
-	  parseVersion(&p1, argv[0]); 
-	  parseVersion(&p2, argv[2]); 
-	  return pkg_version_satisfied(&p1, &p2, argv[1]);
-     } else {
-	  ipkg_message(conf, IPKG_ERROR,
-		       "ipkg compare_versions <v1> <op> <v2>\n"
-		       "<op> is one of <= >= << >> =\n");
-	  return -1;
-     }
-}
-
-#ifndef HOST_CPU_STR
-#define HOST_CPU_STR__(X) #X
-#define HOST_CPU_STR_(X) HOST_CPU_STR__(X)
-#define HOST_CPU_STR HOST_CPU_STR_(HOST_CPU_FOO)
-#endif
-
-static int ipkg_print_architecture_cmd(ipkg_conf_t *conf, int argc, char **argv)
-{
-     nv_pair_list_elt_t *l;
-
-     l = conf->arch_list.head;
-     while (l) {
-	  nv_pair_t *nv = l->data;
-	  printf("arch %s %s\n", nv->name, nv->value);
-	  l = l->next;
-     }
-     return 0;
-}
-
-

Deleted: trunk/src/target/opkg/ipkg_cmd.h
===================================================================
--- trunk/src/target/ipkg/ipkg_cmd.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_cmd.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,46 +0,0 @@
-/* ipkg_cmd.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 IPKG_CMD_H
-#define IPKG_CMD_H
-
-typedef int (*ipkg_cmd_fun_t)(ipkg_conf_t *conf, int argc, const char **argv);
-
-struct ipkg_cmd
-{
-    char *name;
-    int requires_args;
-    ipkg_cmd_fun_t fun;
-};
-typedef struct ipkg_cmd ipkg_cmd_t;
-
-ipkg_cmd_t *ipkg_cmd_find(const char *name);
-#ifdef IPKG_LIB
-int ipkg_cmd_exec(ipkg_cmd_t *cmd, ipkg_conf_t *conf, int argc, 
-                  const char **argv, void *userdata);
-#else
-int ipkg_cmd_exec(ipkg_cmd_t *cmd, ipkg_conf_t *conf, int argc, const char **argv);
-#endif
-int ipkg_multiple_files_scan (ipkg_conf_t *conf, int argc, char *argv[]);
-/* install any packges with state_want == SW_INSTALL */
-int ipkg_install_wanted_packages(ipkg_conf_t *conf);
-/* ensure that all dependences are satisfied */
-int ipkg_configure_packages(ipkg_conf_t *conf, char *pkg_name);
-
-int pkg_mark_provides(pkg_t *pkg);
-
-#endif

Deleted: trunk/src/target/opkg/ipkg_conf.c
===================================================================
--- trunk/src/target/ipkg/ipkg_conf.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_conf.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,717 +0,0 @@
-/* ipkg_conf.c - 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.
-*/
-
-#include <glob.h>
-
-#include "ipkg.h"
-#include "ipkg_conf.h"
-
-#include "xregex.h"
-#include "sprintf_alloc.h"
-#include "ipkg_conf.h"
-#include "ipkg_message.h"
-#include "file_util.h"
-#include "str_util.h"
-#include "xsystem.h"
-
-static int ipkg_conf_parse_file(ipkg_conf_t *conf, const char *filename,
-				pkg_src_list_t *pkg_src_list,
-				nv_pair_list_t *tmp_dest_nv_pair_list,
-				char **tmp_lists_dir);
-static int ipkg_init_options_array(const ipkg_conf_t *conf, ipkg_option_t **options);
-static int ipkg_conf_set_option(const ipkg_option_t *options,
-				const char *name, const char *value);
-static int ipkg_conf_set_default_dest(ipkg_conf_t *conf,
-				      const char *default_dest_name);
-static int set_and_load_pkg_src_list(ipkg_conf_t *conf,
-				     pkg_src_list_t *nv_pair_list);
-static int set_and_load_pkg_dest_list(ipkg_conf_t *conf,
-				      nv_pair_list_t *nv_pair_list, char * lists_dir);
-
-int ipkg_init_options_array(const ipkg_conf_t *conf, ipkg_option_t **options)
-{
-     ipkg_option_t tmp[] = {
-	  { "force_defaults", IPKG_OPT_TYPE_BOOL, &conf->force_defaults },
-	  { "force_depends", IPKG_OPT_TYPE_BOOL, &conf->force_depends },
-	  { "force_overwrite", IPKG_OPT_TYPE_BOOL, &conf->force_overwrite },
-	  { "force_downgrade", IPKG_OPT_TYPE_BOOL, &conf->force_downgrade },
-	  { "force_reinstall", IPKG_OPT_TYPE_BOOL, &conf->force_reinstall },
-	  { "force_space", IPKG_OPT_TYPE_BOOL, &conf->force_space },
-	  { "ftp_proxy", IPKG_OPT_TYPE_STRING, &conf->ftp_proxy },
-	  { "http_proxy", IPKG_OPT_TYPE_STRING, &conf->http_proxy },
-	  { "multiple_providers", IPKG_OPT_TYPE_BOOL, &conf->multiple_providers },
-	  { "no_proxy", IPKG_OPT_TYPE_STRING, &conf->no_proxy },
-	  { "test", IPKG_OPT_TYPE_INT, &conf->noaction },
-	  { "noaction", IPKG_OPT_TYPE_INT, &conf->noaction },
-	  { "nodeps", IPKG_OPT_TYPE_BOOL, &conf->nodeps },
-	  { "offline_root", IPKG_OPT_TYPE_STRING, &conf->offline_root },
-	  { "offline_root_post_script_cmd", IPKG_OPT_TYPE_STRING, &conf->offline_root_post_script_cmd },
-	  { "offline_root_pre_script_cmd", IPKG_OPT_TYPE_STRING, &conf->offline_root_pre_script_cmd },
-	  { "proxy_passwd", IPKG_OPT_TYPE_STRING, &conf->proxy_passwd },
-	  { "proxy_user", IPKG_OPT_TYPE_STRING, &conf->proxy_user },
-	  { "query-all", IPKG_OPT_TYPE_BOOL, &conf->query_all },
-	  { "verbose-wget", IPKG_OPT_TYPE_BOOL, &conf->verbose_wget },
-	  { "verbosity", IPKG_OPT_TYPE_BOOL, &conf->verbosity },
-	  { NULL }
-     };
-
-     *options = (ipkg_option_t *)malloc(sizeof(tmp));
-     if ( options == NULL ){
-        fprintf(stderr,"%s: Unable to allocate memory\n",__FUNCTION__);
-        return -1;
-     }
-
-     memcpy(*options, tmp, sizeof(tmp));
-     return 0;
-};
-
-static void ipkg_conf_override_string(char **conf_str, char *arg_str) 
-{
-     if (arg_str) {
-	  if (*conf_str) {
-	       free(*conf_str);
-	  }
-	  *conf_str = strdup(arg_str);
-     }
-}
-
-static void ipkg_conf_free_string(char **conf_str)
-{
-     if (*conf_str) {
-	  free(*conf_str);
-	  *conf_str = NULL;
-     }
-}
-
-int ipkg_conf_init(ipkg_conf_t *conf, const args_t *args)
-{
-     int err;
-     char *tmp_dir_base;
-     nv_pair_list_t tmp_dest_nv_pair_list;
-     char * lists_dir =NULL;
-     glob_t globbuf;
-     char *etc_ipkg_conf_pattern = "/etc/ipkg/*.conf";
-     char *pending_dir  =NULL;
-
-     memset(conf, 0, sizeof(ipkg_conf_t));
-
-     pkg_src_list_init(&conf->pkg_src_list);
-
-     nv_pair_list_init(&tmp_dest_nv_pair_list);
-     pkg_dest_list_init(&conf->pkg_dest_list);
-
-     nv_pair_list_init(&conf->arch_list);
-
-     conf->restrict_to_default_dest = 0;
-     conf->default_dest = NULL;
-
-
-     if (args->tmp_dir)
-	  tmp_dir_base = args->tmp_dir;
-     else 
-	  tmp_dir_base = getenv("TMPDIR");
-     sprintf_alloc(&conf->tmp_dir, "%s/%s",
-		   tmp_dir_base ? tmp_dir_base : IPKG_CONF_DEFAULT_TMP_DIR_BASE,
-		   IPKG_CONF_TMP_DIR_SUFFIX);
-     conf->tmp_dir = mkdtemp(conf->tmp_dir);
-     if (conf->tmp_dir == NULL) {
-	  fprintf(stderr, "%s: Failed to create temporary directory `%s': %s\n",
-		  __FUNCTION__, conf->tmp_dir, strerror(errno));
-	  return errno;
-     }
-
-     conf->force_depends = 0;
-     conf->force_defaults = 0;
-     conf->force_overwrite = 0;
-     conf->force_downgrade = 0;
-     conf->force_reinstall = 0;
-     conf->force_space = 0;
-     conf->force_removal_of_essential_packages = 0;
-     conf->force_removal_of_dependent_packages = 0;
-     conf->nodeps = 0;
-     conf->verbose_wget = 0;
-     conf->offline_root = NULL;
-     conf->offline_root_pre_script_cmd = NULL;
-     conf->offline_root_post_script_cmd = NULL;
-     conf->multiple_providers = 0;
-     conf->verbosity = 1;
-     conf->noaction = 0;
-
-     conf->http_proxy = NULL;
-     conf->ftp_proxy = NULL;
-     conf->no_proxy = NULL;
-     conf->proxy_user = NULL;
-     conf->proxy_passwd = NULL;
-
-     pkg_hash_init("pkg-hash", &conf->pkg_hash, IPKG_CONF_DEFAULT_HASH_LEN);
-     hash_table_init("file-hash", &conf->file_hash, IPKG_CONF_DEFAULT_HASH_LEN);
-     hash_table_init("obs-file-hash", &conf->obs_file_hash, IPKG_CONF_DEFAULT_HASH_LEN);
-     lists_dir=(char *)malloc(1);
-     lists_dir[0]='\0';
-     if (args->conf_file) {
-	  struct stat stat_buf;
-	  err = stat(args->conf_file, &stat_buf);
-	  if (err == 0)
-	       if (ipkg_conf_parse_file(conf, args->conf_file,
-				    &conf->pkg_src_list, &tmp_dest_nv_pair_list,&lists_dir)<0) {
-                   /* Memory leakage from ipkg_conf_parse-file */
-                   return -1;
-               }
-                   
-     }
-
-     /* if (!lists_dir ){*/
-     if (strlen(lists_dir)<=1 ){
-        lists_dir = realloc(lists_dir,strlen(IPKG_CONF_LISTS_DIR)+2);
-        sprintf (lists_dir,"%s",IPKG_CONF_LISTS_DIR);
-     }
-
-     if (args->offline_root) {
-            char *tmp = malloc(strlen(lists_dir) + strlen(args->offline_root) + 1);
-            sprintf_alloc(&tmp, "%s/%s",args->offline_root,lists_dir);
-            free(lists_dir);
-            lists_dir = tmp;
-     }
-
-     pending_dir = malloc(strlen(lists_dir)+strlen("/pending")+5);
-     snprintf(pending_dir,strlen(lists_dir)+strlen("/pending") ,"%s%s",lists_dir,"/pending");
-
-     conf->lists_dir = strdup(lists_dir);
-     conf->pending_dir = strdup(pending_dir);
-
-     if (args->offline_root) 
-	  sprintf_alloc(&etc_ipkg_conf_pattern, "%s/etc/ipkg/*.conf", args->offline_root);
-     memset(&globbuf, 0, sizeof(globbuf));
-     err = glob(etc_ipkg_conf_pattern, 0, NULL, &globbuf);
-     if (!err) {
-	  int i;
-	  for (i = 0; i < globbuf.gl_pathc; i++) {
-	       if (globbuf.gl_pathv[i]) 
-		    if ( ipkg_conf_parse_file(conf, globbuf.gl_pathv[i], 
-				         &conf->pkg_src_list, &tmp_dest_nv_pair_list,&lists_dir)<0) {
-                        /* Memory leakage from ipkg_conf_parse-file */
-                        return -1;
-	            }
-	  }
-     }
-     globfree(&globbuf);
-
-     /* if no architectures were defined, then default all, noarch, and host architecture */
-     if (nv_pair_list_empty(&conf->arch_list)) {
-	  nv_pair_list_append(&conf->arch_list, "all", "1");
-	  nv_pair_list_append(&conf->arch_list, "noarch", "1");
-	  nv_pair_list_append(&conf->arch_list, HOST_CPU_STR, "10");
-     }
-
-     /* Even if there is no conf file, we'll need at least one dest. */
-     if (tmp_dest_nv_pair_list.head == NULL) {
-	  nv_pair_list_append(&tmp_dest_nv_pair_list,
-			      IPKG_CONF_DEFAULT_DEST_NAME,
-			      IPKG_CONF_DEFAULT_DEST_ROOT_DIR);
-     }
-
-     /* After parsing the file, set options from command-line, (so that
-	command-line arguments take precedence) */
-     /* XXX: CLEANUP: The interaction between args.c and ipkg_conf.c
-	really needs to be cleaned up. There is so much duplication
-	right now it is ridiculous. Maybe ipkg_conf_t should just save
-	a pointer to args_t (which could then not be freed), rather
-	than duplicating every field here? */
-     if (args->force_depends) {
-	  conf->force_depends = 1;
-     }
-     if (args->force_defaults) {
-	  conf->force_defaults = 1;
-     }
-     if (args->force_overwrite) {
-	  conf->force_overwrite = 1;
-     }
-     if (args->force_downgrade) {
-	  conf->force_downgrade = 1;
-     }
-     if (args->force_reinstall) {
-	  conf->force_reinstall = 1;
-     }
-     if (args->force_removal_of_dependent_packages) {
-	  conf->force_removal_of_dependent_packages = 1;
-     }
-     if (args->force_removal_of_essential_packages) {
-	  conf->force_removal_of_essential_packages = 1;
-     }
-     if (args->nodeps) {
-	  conf->nodeps = 1;
-     }
-     if (args->noaction) {
-	  conf->noaction = 1;
-     }
-     if (args->query_all) {
-	  conf->query_all = 1;
-     }
-     if (args->verbose_wget) {
-	  conf->verbose_wget = 1;
-     }
-     if (args->multiple_providers) {
-	  conf->multiple_providers = 1;
-     }
-     if (args->verbosity != conf->verbosity) {
-	  conf->verbosity = args->verbosity;
-     } 
-
-     ipkg_conf_override_string(&conf->offline_root, 
-			       args->offline_root);
-     ipkg_conf_override_string(&conf->offline_root_pre_script_cmd, 
-			       args->offline_root_pre_script_cmd);
-     ipkg_conf_override_string(&conf->offline_root_post_script_cmd, 
-			       args->offline_root_post_script_cmd);
-
-/* Pigi: added a flag to disable the checking of structures if the command does not need to 
-         read anything from there.
-*/
-     if ( !(args->nocheckfordirorfile)){
-        /* need to run load the source list before dest list -Jamey */
-        if ( !(args->noreadfeedsfile))
-           set_and_load_pkg_src_list(conf, &conf->pkg_src_list);
-   
-        /* Now that we have resolved conf->offline_root, we can commit to
-	   the directory names for the dests and load in all the package
-	   lists. */
-        set_and_load_pkg_dest_list(conf, &tmp_dest_nv_pair_list,lists_dir);
-   
-        if (args->dest) {
-	     err = ipkg_conf_set_default_dest(conf, args->dest);
-	     if (err) {
-	          return err;
-	     }
-        }
-     }
-     nv_pair_list_deinit(&tmp_dest_nv_pair_list);
-     free(lists_dir);
-     free(pending_dir);
-
-     return 0;
-}
-
-void ipkg_conf_deinit(ipkg_conf_t *conf)
-{
-#ifdef IPKG_DEBUG_NO_TMP_CLEANUP
-#error
-     fprintf(stderr, "%s: Not cleaning up %s since ipkg compiled "
-	     "with IPKG_DEBUG_NO_TMP_CLEANUP\n",
-	     __FUNCTION__, conf->tmp_dir);
-#else
-     int err;
-
-     err = rmdir(conf->tmp_dir);
-     if (err) {
-	  if (errno == ENOTEMPTY) {
-	       char *cmd;
-	       sprintf_alloc(&cmd, "rm -fr %s\n", conf->tmp_dir);
-	       err = xsystem(cmd);
-	       free(cmd);
-	  }
-	  if (err)
-	       fprintf(stderr, "WARNING: Unable to remove temporary directory: %s: %s\n", conf->tmp_dir, strerror(errno));
-     }
-#endif /* IPKG_DEBUG_NO_TMP_CLEANUP */
-
-     free(conf->tmp_dir); /*XXX*/
-
-     pkg_src_list_deinit(&conf->pkg_src_list);
-     pkg_dest_list_deinit(&conf->pkg_dest_list);
-     nv_pair_list_deinit(&conf->arch_list);
-     if (&conf->pkg_hash)
-	            pkg_hash_deinit(&conf->pkg_hash);
-     if (&conf->file_hash)
-	            hash_table_deinit(&conf->file_hash);
-     if (&conf->obs_file_hash)
-	            hash_table_deinit(&conf->obs_file_hash);
-
-     ipkg_conf_free_string(&conf->offline_root);
-     ipkg_conf_free_string(&conf->offline_root_pre_script_cmd);
-     ipkg_conf_free_string(&conf->offline_root_post_script_cmd);
-
-     if (conf->verbosity > 1) { 
-	  int i;
-	  hash_table_t *hashes[] = {
-	       &conf->pkg_hash,
-	       &conf->file_hash,
-	       &conf->obs_file_hash };
-	  for (i = 0; i < 3; i++) {
-	       hash_table_t *hash = hashes[i];
-	       int c = 0;
-	       int n_conflicts = 0;
-	       int j;
-	       for (j = 0; j < hash->n_entries; j++) {
-		    int len = 0;
-		    hash_entry_t *e = &hash->entries[j];
-		    if (e->next)
-			 n_conflicts++;
-		    while (e && e->key) {
-			 len++;
-			 e = e->next;
-		    }
-		    if (len > c) 
-			 c = len;
-	       }
-	       ipkg_message(conf, IPKG_DEBUG, "hash_table[%s] n_buckets=%d n_elements=%d max_conflicts=%d n_conflicts=%d\n", 
-			    hash->name, hash->n_entries, hash->n_elements, c, n_conflicts);
-	       hash_table_deinit(hash);
-	  }
-     }
-}
-
-static int ipkg_conf_set_default_dest(ipkg_conf_t *conf,
-				      const char *default_dest_name)
-{
-     pkg_dest_list_elt_t *iter;
-     pkg_dest_t *dest;
-
-     for (iter = conf->pkg_dest_list.head; iter; iter = iter->next) {
-	  dest = iter->data;
-	  if (strcmp(dest->name, default_dest_name) == 0) {
-	       conf->default_dest = dest;
-	       conf->restrict_to_default_dest = 1;
-	       return 0;
-	  }
-     }
-
-     fprintf(stderr, "ERROR: Unknown dest name: `%s'\n", default_dest_name);
-
-     return 1;
-}
-
-static int set_and_load_pkg_src_list(ipkg_conf_t *conf, pkg_src_list_t *pkg_src_list)
-{
-     pkg_src_list_elt_t *iter;
-     pkg_src_t *src;
-     char *list_file;
-
-     for (iter = pkg_src_list->head; iter; iter = iter->next) {
-          src = iter->data;
-	  if (src == NULL) {
-	       continue;
-	  }
-
-	  sprintf_alloc(&list_file, "%s/%s", 
-			  conf->restrict_to_default_dest ? conf->default_dest->lists_dir : conf->lists_dir, 
-			  src->name);
-
-	  if (file_exists(list_file)) {
-	       pkg_hash_add_from_file(conf, list_file, src, NULL, 0);
-	  }
-	  free(list_file);
-     }
-
-     return 0;
-}
-
-static int set_and_load_pkg_dest_list(ipkg_conf_t *conf, nv_pair_list_t *nv_pair_list, char *lists_dir )
-{
-     nv_pair_list_elt_t *iter;
-     nv_pair_t *nv_pair;
-     pkg_dest_t *dest;
-     char *root_dir;
-
-     for (iter = nv_pair_list->head; iter; iter = iter->next) {
-	  nv_pair = iter->data;
-
-	  if (conf->offline_root) {
-	       sprintf_alloc(&root_dir, "%s%s", conf->offline_root, nv_pair->value);
-	  } else {
-	       root_dir = strdup(nv_pair->value);
-	  }
-	  dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, lists_dir);
-	  free(root_dir);
-	  if (dest == NULL) {
-	       continue;
-	  }
-	  if (conf->default_dest == NULL) {
-	       conf->default_dest = dest;
-	  }
-	  if (file_exists(dest->status_file_name)) {
-	       pkg_hash_add_from_file(conf, dest->status_file_name,
-				      NULL, dest, 1);
-	  }
-     }
-
-     return 0;
-}
-
-static int ipkg_conf_parse_file(ipkg_conf_t *conf, const char *filename,
-				pkg_src_list_t *pkg_src_list,
-				nv_pair_list_t *tmp_dest_nv_pair_list,
-				char **lists_dir)
-{
-     int err;
-     ipkg_option_t * options;
-     FILE *file = fopen(filename, "r");
-     regex_t valid_line_re, comment_re;
-#define regmatch_size 12
-     regmatch_t regmatch[regmatch_size];
-
-     if (ipkg_init_options_array(conf, &options)<0)
-        return ENOMEM;
-
-     if (file == NULL) {
-	  fprintf(stderr, "%s: failed to open %s: %s\n",
-		  __FUNCTION__, filename, strerror(errno));
-	  free(options);
-	  return errno;
-     }
-     ipkg_message(conf, IPKG_NOTICE, "loading conf file %s\n", filename);
-
-     err = xregcomp(&comment_re, 
-		    "^[[:space:]]*(#.*|[[:space:]]*)$",
-		    REG_EXTENDED);
-     if (err) {
-	  free(options);
-	  return err;
-     }
-     err = xregcomp(&valid_line_re, "^[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))([[:space:]]+([^[:space:]]+))?[[:space:]]*$", REG_EXTENDED);
-     if (err) {
-	  free(options);
-	  return err;
-     }
-
-     while(1) {
-	  int line_num = 0;
-	  char *line;
-	  char *type, *name, *value, *extra;
-
-	  line = file_read_line_alloc(file);
-	  line_num++;
-	  if (line == NULL) {
-	       break;
-	  }
-
-	  str_chomp(line);
-
-	  if (regexec(&comment_re, line, 0, 0, 0) == 0) {
-	       goto NEXT_LINE;
-	  }
-
-	  if (regexec(&valid_line_re, line, regmatch_size, regmatch, 0) == REG_NOMATCH) {
-	       str_chomp(line);
-	       fprintf(stderr, "%s:%d: Ignoring invalid line: `%s'\n",
-		       filename, line_num, line);
-	       goto NEXT_LINE;
-	  }
-
-	  /* This has to be so ugly to deal with optional quotation marks */
-	  if (regmatch[2].rm_so > 0) {
-	       type = strndup(line + regmatch[2].rm_so,
-			      regmatch[2].rm_eo - regmatch[2].rm_so);
-	  } else {
-	       type = strndup(line + regmatch[3].rm_so,
-			      regmatch[3].rm_eo - regmatch[3].rm_so);
-	  }
-	  if (regmatch[5].rm_so > 0) {
-	       name = strndup(line + regmatch[5].rm_so,
-			      regmatch[5].rm_eo - regmatch[5].rm_so);
-	  } else {
-	       name = strndup(line + regmatch[6].rm_so,
-			      regmatch[6].rm_eo - regmatch[6].rm_so);
-	  }
-	  if (regmatch[8].rm_so > 0) {
-	       value = strndup(line + regmatch[8].rm_so,
-			       regmatch[8].rm_eo - regmatch[8].rm_so);
-	  } else {
-	       value = strndup(line + regmatch[9].rm_so,
-			       regmatch[9].rm_eo - regmatch[9].rm_so);
-	  }
-	  extra = NULL;
-	  if (regmatch[11].rm_so > 0) {
-	       extra = strndup (line + regmatch[11].rm_so,
-				regmatch[11].rm_eo - regmatch[11].rm_so);
-	  }
-
-	  /* We use the tmp_dest_nv_pair_list below instead of
-	     conf->pkg_dest_list because we might encounter an
-	     offline_root option later and that would invalidate the
-	     directories we would have computed in
-	     pkg_dest_list_init. (We do a similar thing with
-	     tmp_src_nv_pair_list for sake of symmetry.) */
-	  if (strcmp(type, "option") == 0) {
-	       ipkg_conf_set_option(options, name, value);
-	  } else if (strcmp(type, "src") == 0) {
-	       if (!nv_pair_list_find(pkg_src_list, name)) {
-		    pkg_src_list_append (pkg_src_list, name, value, extra, 0);
-	       } else {
-		    ipkg_message(conf, IPKG_ERROR, "ERROR: duplicate src declaration.  Skipping:\n\t src %s %s\n",
-				 name, value);
-	       }
-	  } else if (strcmp(type, "src/gz") == 0) {
-	       if (!nv_pair_list_find(pkg_src_list, name)) {
-		    pkg_src_list_append (pkg_src_list, name, value, extra, 1);
-	       } else {
-		    ipkg_message(conf, IPKG_ERROR, "ERROR: duplicate src declaration.  Skipping:\n\t src %s %s\n",
-				 name, value);
-	       }
-	  } else if (strcmp(type, "dest") == 0) {
-	       nv_pair_list_append(tmp_dest_nv_pair_list, name, value);
-	  } else if (strcmp(type, "lists_dir") == 0) {
-	       *lists_dir = realloc(*lists_dir,strlen(value)+1);
-               if (*lists_dir == NULL) {
-		    ipkg_message(conf, IPKG_ERROR, "ERROR: Not enough memory\n");
-	            free(options);
-	            return EINVAL;
-               }
-               sprintf (*lists_dir,"%s",value);
-	  } else if (strcmp(type, "arch") == 0) {
-	       ipkg_message(conf, IPKG_INFO, "supported arch %s priority (%s)\n", name, value);
-	       if (!value) {
-		    ipkg_message(conf, IPKG_NOTICE, "defaulting architecture %s priority to 10\n", name);
-		    value = strdup("10");
-	       }
-	       nv_pair_list_append(&conf->arch_list, strdup(name), strdup(value));
-	  } else {
-	       fprintf(stderr, "WARNING: Ignoring unknown configuration "
-		       "parameter: %s %s %s\n", type, name, value);
-	       free(options);
-	       return EINVAL;
-	  }
-
-	  free(type);
-	  free(name);
-	  free(value);
-	  if (extra)
-	       free (extra);
-
-     NEXT_LINE:
-	  free(line);
-     }
-
-     free(options);
-     regfree(&comment_re);
-     regfree(&valid_line_re);
-     fclose(file);
-
-     return 0;
-}
-
-static int ipkg_conf_set_option(const ipkg_option_t *options,
-				const char *name, const char *value)
-{
-     int i = 0;
-     while (options[i].name) {
-	  if (strcmp(options[i].name, name) == 0) {
-	       switch (options[i].type) {
-	       case IPKG_OPT_TYPE_BOOL:
-		    *((int *)options[i].value) = 1;
-		    return 0;
-	       case IPKG_OPT_TYPE_INT:
-		    if (value) {
-			 *((int *)options[i].value) = atoi(value);
-			 return 0;
-		    } else {
-			 printf("%s: Option %s need an argument\n",
-				__FUNCTION__, name);
-			 return EINVAL;
-		    }		    
-	       case IPKG_OPT_TYPE_STRING:
-		    if (value) {
-			 *((char **)options[i].value) = strdup(value);
-			 return 0;
-		    } else {
-			 printf("%s: Option %s need an argument\n",
-				__FUNCTION__, name);
-			 return EINVAL;
-		    }
-	       }
-	  }
-	  i++;
-     }
-    
-     fprintf(stderr, "%s: Unrecognized option: %s=%s\n",
-	     __FUNCTION__, name, value);
-     return EINVAL;
-}
-
-int ipkg_conf_write_status_files(ipkg_conf_t *conf)
-{
-     pkg_dest_list_elt_t *iter;
-     pkg_dest_t *dest;
-     pkg_vec_t *all;
-     pkg_t *pkg;
-     register int i;
-     int err;
-
-     if (conf->noaction)
-	  return 0;
-     for (iter = conf->pkg_dest_list.head; iter; iter = iter->next) {
-	  dest = iter->data;
-	  dest->status_file = fopen(dest->status_file_tmp_name, "w");
-	  if (dest->status_file == NULL) {
-	       fprintf(stderr, "%s: Can't open status file: %s for writing: %s\n",
-		       __FUNCTION__, dest->status_file_name, strerror(errno));
-	  }
-     }
-
-     all = pkg_vec_alloc();
-     pkg_hash_fetch_available(&conf->pkg_hash, all);
-
-     for(i = 0; i < all->len; i++) {
-	  pkg = all->pkgs[i];
-	  /* We don't need most uninstalled packages in the status file */
-	  if (pkg->state_status == SS_NOT_INSTALLED
-	      && (pkg->state_want == SW_UNKNOWN
-		  || pkg->state_want == SW_DEINSTALL
-		  || pkg->state_want == SW_PURGE)) {
-	       continue;
-	  }
-	  if (!pkg) {
-	    fprintf(stderr, "Null package\n");
-	  }
-	  if (pkg->dest == NULL) {
-	       fprintf(stderr, "%s: ERROR: Can't write status for "
-		       "package %s since it has a NULL dest\n",
-		       __FUNCTION__, pkg->name);
-	       continue;
-	  }
-	  if (pkg->dest->status_file) {
-	       pkg_print_status(pkg, pkg->dest->status_file);
-	  }
-     }
-
-     pkg_vec_free(all);
-
-     for (iter = conf->pkg_dest_list.head; iter; iter = iter->next) {
-	  dest = iter->data;
-	  if (dest->status_file) {
-	       err = ferror(dest->status_file);
-	       fclose(dest->status_file);
-	       dest->status_file = NULL;
-	       if (!err) {
-		    file_move(dest->status_file_tmp_name, dest->status_file_name);
-	       } else {
-		    fprintf(stderr, "%s: ERROR: An error has occurred writing %s, "
-			    "retaining old %s\n", __FUNCTION__, 
-			    dest->status_file_tmp_name, dest->status_file_name);
-	       }
-	  }
-     }
-
-     return 0;
-}
-
-
-char *root_filename_alloc(ipkg_conf_t *conf, char *filename)
-{
-     char *root_filename;
-     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
-     return root_filename;
-}

Deleted: trunk/src/target/opkg/ipkg_conf.h
===================================================================
--- trunk/src/target/ipkg/ipkg_conf.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_conf.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,107 +0,0 @@
-/* ipkg_conf.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 IPKG_CONF_H
-#define IPKG_CONF_H
-
-typedef struct ipkg_conf ipkg_conf_t;
-
-#include "hash_table.h"
-#include "ipkg.h"
-#include "args.h"
-#include "pkg.h"
-#include "pkg_hash.h"
-#include "pkg_src_list.h"
-#include "pkg_dest_list.h"
-#include "nv_pair_list.h"
-
-#define IPKG_CONF_DEFAULT_TMP_DIR_BASE "/tmp"
-#define IPKG_CONF_TMP_DIR_SUFFIX "ipkg-XXXXXX"
-#define IPKG_CONF_LISTS_DIR  IPKG_STATE_DIR_PREFIX "/lists"
-#define IPKG_CONF_PENDING_DIR IPKG_STATE_DIR_PREFIX "/pending"
-
-/* In case the config file defines no dest */
-#define IPKG_CONF_DEFAULT_DEST_NAME "root"
-#define IPKG_CONF_DEFAULT_DEST_ROOT_DIR "/"
-
-#define IPKG_CONF_DEFAULT_HASH_LEN 1024
-
-struct ipkg_conf
-{
-     pkg_src_list_t pkg_src_list;
-     pkg_dest_list_t pkg_dest_list;
-     nv_pair_list_t arch_list;
-
-     int restrict_to_default_dest;
-     pkg_dest_t *default_dest;
-
-     char *tmp_dir;
-     const char *lists_dir;
-     const char *pending_dir;
-
-     /* options */
-     int force_depends;
-     int force_defaults;
-     int force_overwrite;
-     int force_downgrade;
-     int force_reinstall;
-     int force_space;
-     int force_removal_of_dependent_packages;
-     int force_removal_of_essential_packages;
-     int nodeps; /* do not follow dependences */
-     int verbose_wget;
-     int multiple_providers;
-     char *offline_root;
-     char *offline_root_pre_script_cmd;
-     char *offline_root_post_script_cmd;
-     int query_all;
-     int verbosity;
-     int noaction;
-
-     /* proxy options */
-     char *http_proxy;
-     char *ftp_proxy;
-     char *no_proxy;
-     char *proxy_user;
-     char *proxy_passwd;
-
-     hash_table_t pkg_hash;
-     hash_table_t file_hash;
-     hash_table_t obs_file_hash;
-};
-
-enum ipkg_option_type {
-     IPKG_OPT_TYPE_BOOL,
-     IPKG_OPT_TYPE_INT,
-     IPKG_OPT_TYPE_STRING
-};
-typedef enum ipkg_option_type ipkg_option_type_t;
-
-typedef struct ipkg_option ipkg_option_t;
-struct ipkg_option {
-     const char *name;
-     const ipkg_option_type_t type;
-     const void *value;
-};
-
-int ipkg_conf_init(ipkg_conf_t *conf, const args_t *args);
-void ipkg_conf_deinit(ipkg_conf_t *conf);
-
-int ipkg_conf_write_status_files(ipkg_conf_t *conf);
-char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
-
-#endif

Deleted: trunk/src/target/opkg/ipkg_configure.c
===================================================================
--- trunk/src/target/ipkg/ipkg_configure.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_configure.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,40 +0,0 @@
-/* ipkg_configure.c - 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.
-*/
-
-#include "ipkg.h"
-
-#include "ipkg_configure.h"
-
-int ipkg_configure(ipkg_conf_t *conf, pkg_t *pkg)
-{
-    int err;
-
-    /* DPKG_INCOMPATIBILITY:
-       dpkg actually does some conffile handling here, rather than at the
-       end of ipkg_install(). Do we care? */
-    /* DPKG_INCOMPATIBILITY:
-       dpkg actually includes a version number to this script call */
-    err = pkg_run_script(conf, pkg, "postinst", "configure");
-    if (err) {
-	printf("ERROR: %s.postinst returned %d\n", pkg->name, err);
-	return err;
-    }
-
-    ipkg_state_changed++;
-    return 0;
-}
-

Deleted: trunk/src/target/opkg/ipkg_configure.h
===================================================================
--- trunk/src/target/ipkg/ipkg_configure.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_configure.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,25 +0,0 @@
-/* ipkg_configure.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 IPKG_CONFIGURE_H
-#define IPKG_CONFIGURE_H
-
-#include "ipkg_conf.h"
-
-int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
-
-#endif

Deleted: trunk/src/target/opkg/ipkg_download.c
===================================================================
--- trunk/src/target/ipkg/ipkg_download.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_download.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,244 +0,0 @@
-/* vi: set noexpandtab sw=4 sts=4: */
-/* ipkg_download.c - the itsy package management system
-
-   Carl D. Worth
-
-   Copyright (C) 2001 University of Southern California
-   Copyright (C) 2008 OpenMoko Inc
-
-   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 <curl/curl.h>
-
-#include "ipkg.h"
-#include "ipkg_download.h"
-#include "ipkg_message.h"
-
-#include "sprintf_alloc.h"
-#include "xsystem.h"
-#include "file_util.h"
-#include "str_util.h"
-
-
-int
-curl_progress_func (void* data,
-                         double t, /* dltotal */
-                         double d, /* dlnow */
-                         double ultotal,
-                         double ulnow)
-{
-    int i;
-    int p = d*100/t;
-    printf ("\r%3d%% |", p);
-    for (i = 1; i < 73; i++)
-    {
-	if (i <= p)
-	    printf ("=");
-	else
-	    printf ("-");
-    }
-    printf ("|");
-    fflush(stdout);
-    return 0;
-}
-
-int ipkg_download(ipkg_conf_t *conf, const char *src, const char *dest_file_name)
-{
-    int err = 0;
-
-    char *src_basec = strdup(src);
-    char *src_base = basename(src_basec);
-    char *tmp_file_location;
-    char *cmd;
-
-    ipkg_message(conf,IPKG_NOTICE,"Downloading %s\n", src);
-	
-    fflush(stdout);
-    
-    if (str_starts_with(src, "file:")) {
-	int ret;
-	const char *file_src = src + 5;
-	ipkg_message(conf,IPKG_INFO,"Copying %s to %s...", file_src, dest_file_name);
-	ret = file_copy(src + 5, dest_file_name);
-	ipkg_message(conf,IPKG_INFO,"Done\n");
-	return ret;
-    }
-
-    sprintf_alloc(&tmp_file_location, "%s/%s", conf->tmp_dir, src_base);
-    err = unlink(tmp_file_location);
-    if (err && errno != ENOENT) {
-	ipkg_message(conf,IPKG_ERROR, "%s: ERROR: failed to unlink %s: %s\n",
-		__FUNCTION__, tmp_file_location, strerror(errno));
-	free(tmp_file_location);
-	return errno;
-    }
-
-    if (conf->http_proxy) {
-	ipkg_message(conf,IPKG_DEBUG,"Setting environment variable: http_proxy = %s\n", conf->http_proxy);
-	setenv("http_proxy", conf->http_proxy, 1);
-    }
-    if (conf->ftp_proxy) {
-	ipkg_message(conf,IPKG_DEBUG,"Setting environment variable: ftp_proxy = %s\n", conf->ftp_proxy);
-	setenv("ftp_proxy", conf->ftp_proxy, 1);
-    }
-    if (conf->no_proxy) {
-	ipkg_message(conf,IPKG_DEBUG,"Setting environment variable: no_proxy = %s\n", conf->no_proxy);
-	setenv("no_proxy", conf->no_proxy, 1);
-    }
-
-    /* XXX: BUG rewrite to use execvp or else busybox's internal wget -Jamey 7/23/2002 */ 
-#if 0
-    sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s %s -P %s %s",
-		  (conf->http_proxy || conf->ftp_proxy) ? "--proxy=on" : "",
-		  conf->proxy_user ? "--proxy-user=" : "",
-		  conf->proxy_user ? conf->proxy_user : "",
-		  conf->proxy_passwd ? "--proxy-passwd=" : "",
-		  conf->proxy_passwd ? conf->proxy_passwd : "",
-		  conf->verbose_wget ? "" : "-q",
-		  conf->tmp_dir,
-		  src);
-    err = xsystem(cmd);
-    if (err) {
-	if (err != -1) {
-	    ipkg_message(conf,IPKG_ERROR, "%s: ERROR: Command failed with return value %d: `%s'\n",
-		    __FUNCTION__, err, cmd);
-	} 
-	unlink(tmp_file_location);
-	free(tmp_file_location);
-	free(src_basec);
-	free(cmd);
-	return EINVAL;
-    }
-    free(cmd);
-#endif
-    CURL *curl;
-    CURLcode res;
-    FILE * file = fopen (tmp_file_location, "w");
-
-    curl = curl_easy_init ();
-    if (curl)
-    {
-	curl_easy_setopt (curl, CURLOPT_URL, src);
-	curl_easy_setopt (curl, CURLOPT_WRITEDATA, file);
-	curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
-	curl_easy_setopt (curl, CURLOPT_PROGRESSFUNCTION, curl_progress_func);
-	res = curl_easy_perform (curl);
-	curl_easy_cleanup (curl);
-	fclose (file);
-
-    }
-    else
-	return -1;
-
-    printf ("\n");
-
-    err = file_move(tmp_file_location, dest_file_name);
-
-    free(tmp_file_location);
-    free(src_basec);
-
-    if (err) {
-	return err;
-    }
-
-    return 0;
-}
-
-int ipkg_download_pkg(ipkg_conf_t *conf, pkg_t *pkg, const char *dir)
-{
-    int err;
-    char *url;
-
-    if (pkg->src == NULL) {
-	ipkg_message(conf,IPKG_ERROR, "ERROR: Package %s (parent %s) is not available from any configured src.\n",
-		pkg->name, pkg->parent->name);
-	return -1;
-    }
-
-    sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename);
-
-    /* XXX: BUG: The pkg->filename might be something like
-       "../../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);
-
-    err = ipkg_download(conf, url, pkg->local_filename);
-    free(url);
-
-    return err;
-}
-
-/*
- * Downloads file from url, installs in package database, return package name. 
- */
-int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep)
-{
-     int err = 0;
-     pkg_t *pkg;
-     pkg = pkg_new();
-     if (pkg == NULL)
-	  return ENOMEM;
-
-     if (str_starts_with(url, "http://")
-	 || str_starts_with(url, "ftp://")) {
-	  char *tmp_file;
-	  char *file_basec = strdup(url);
-	  char *file_base = basename(file_basec);
-
-	  sprintf_alloc(&tmp_file, "%s/%s", conf->tmp_dir, file_base);
-	  err = ipkg_download(conf, url, tmp_file);
-	  if (err)
-	       return err;
-
-	  err = pkg_init_from_file(pkg, tmp_file);
-	  if (err)
-	       return err;
-	  pkg->local_filename = strdup(tmp_file);
-
-	  free(tmp_file);
-	  free(file_basec);
-
-     } else if (strcmp(&url[strlen(url) - 4], IPKG_PKG_EXTENSION) == 0
-		|| strcmp(&url[strlen(url) - 4], DPKG_PKG_EXTENSION) == 0) {
-
-	  err = pkg_init_from_file(pkg, url);
-	  if (err)
-	       return err;
-	  pkg->local_filename = strdup(url);
-	  ipkg_message(conf, IPKG_DEBUG2, "Package %s provided by hand \(%s\).\n", pkg->name,pkg->local_filename);
-          pkg->provided_by_hand = 1;
-
-     } else {
-       pkg_deinit(pkg);
-       free(pkg);
-       return 0;
-     }
-
-     if (!pkg->architecture) {
-	  ipkg_message(conf, IPKG_ERROR, "Package %s has no Architecture defined.\n", pkg->name);
-	  return -EINVAL;
-     }
-
-     pkg->dest = conf->default_dest;
-     pkg->state_want = SW_INSTALL;
-     pkg->state_flag |= SF_PREFER;
-     pkg = hash_insert_pkg(&conf->pkg_hash, pkg, 1,conf);  
-     if ( pkg == NULL ){
-        fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__);
-        return 0;
-     }
-     if (namep) {
-	  *namep = strdup(pkg->name);
-     }
-     return 0;
-}

Deleted: trunk/src/target/opkg/ipkg_download.h
===================================================================
--- trunk/src/target/ipkg/ipkg_download.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_download.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,30 +0,0 @@
-/* ipkg_download.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 IPKG_DOWNLOAD_H
-#define IPKG_DOWNLOAD_H
-
-#include "ipkg_conf.h"
-
-int ipkg_download(ipkg_conf_t *conf, const char *src, const char *dest_file_name);
-int ipkg_download_pkg(ipkg_conf_t *conf, pkg_t *pkg, const char *dir);
-/*
- * Downloads file from url, installs in package database, return package name. 
- */
-int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
-
-#endif

Deleted: trunk/src/target/opkg/ipkg_extract_test.c
===================================================================
--- trunk/src/target/ipkg/ipkg_extract_test.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_extract_test.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,46 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "libbb/libbb.h"
-
-/*
- * build thus: 
-
- * gcc -o ipkg_extract_test ipkg_extract_test.c -I./busybox-0.60.2/libbb -L./busybox-0.60.2 -lbb
- *
- */
-const char * applet_name;
-
-int main(int argc, char * argv[])
-{
-  /*
-   * see libbb.h and let your imagination run wild
-   * or, set the last item below to extract_one_to_buffer, and you get the control file in 
-   * "returned"
-   * or, set the last one to extract_all_to_fs, and, well, guess what happens
-   */
-
-    /* enum extract_functions_e dowhat = extract_control_tar_gz | extract_unconditional | extract_one_to_buffer; */
-    enum extract_functions_e dowhat = extract_control_tar_gz | extract_all_to_fs | extract_preserve_date;
-  char * returned;
-  char * filename;
-  
-  if(argc < 2){
-    fprintf(stderr, "syntax: %s <ipkg file> [<file_to_extract>]\n", argv[0]);
-    exit(0);
-  }
-  
-  if (argc < 3){
-    filename=NULL;
-  } else {
-    filename = argv[2];
-  }
-
-  returned = deb_extract(argv[1], stdout, dowhat, NULL, filename);
-  
-  if(returned)
-    fprintf(stderr, "returned %s\n", returned);
-  else
-    fprintf(stderr, "extract returned nuthin'\n");
-
-  return 0;
-}

Deleted: trunk/src/target/opkg/ipkg_hash_test.c
===================================================================
--- trunk/src/target/ipkg/ipkg_hash_test.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_hash_test.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,79 +0,0 @@
-/* ipkg_hash_test.c - 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.
-*/
-
-#include "ipkg.h"
-
-#include "hash_table.h"
-#include "ipkg_utils.h"
-#include "pkg_hash.h"
-
-int main(int argc, char *argv[])
-{
-     ipkg_conf_t conf;
-     hash_table_t *hash = &conf.pkg_hash;
-     pkg_vec_t * pkg_vec;
-
-    if (argc < 3) {
-	fprintf(stderr, "Usage: %s <pkgs_file1> <pkgs_file2> [pkg_name...]\n", argv[0]);
-	exit(1);
-    }
-    pkg_hash_init("test", hash, 1024);
-
-    pkg_hash_add_from_file(&conf, argv[1], NULL, NULL, 0);
-    pkg_hash_add_from_file(&conf, argv[2], NULL, NULL, 0);
-
-    if (argc < 4) {
-	pkg_print_info( pkg_hash_fetch_by_name_version(hash, "libc6", "2.2.3-2"), stdout);
-	/*	for(i = 0; i < pkg_vec->len; i++)
-		pkg_print(pkg_vec->pkgs[i], stdout);
-	*/
-    } else {
-	int i, j, k;
-	char **unresolved;
-
-	pkg_vec_t * dep_vec;
-	for (i = 3; i < argc; i++) {
-	    pkg_vec = pkg_vec_fetch_by_name(hash, argv[i]);
-	    if (pkg_vec == NULL) {
-		fprintf(stderr, "*** WARNING: Unknown package: %s\n\n", argv[i]);
-		continue;
-	    }
-
-	    for(j = 0; j < pkg_vec->len; j++){
-		pkg_print_info(pkg_vec->pkgs[j], stdout);
-		dep_vec = pkg_vec_alloc();
-		pkg_hash_fetch_unsatisfied_dependencies(&conf,
-							pkg_vec->pkgs[j],
-							dep_vec,
-							&unresolved);
-		if(dep_vec){
-		    fprintf(stderr, "and the unsatisfied dependencies are:\n");
-		    for(k = 0; k < dep_vec->len; k++){
-			fprintf(stderr, "%s version %s\n", dep_vec->pkgs[k]->name, dep_vec->pkgs[k]->version);
-		    }
-		}
-		
-		fputs("", stdout);
-		
-	    }
- 	}
-    }
-
-    pkg_hash_deinit(hash);
-
-    return 0;
-}

Deleted: trunk/src/target/opkg/ipkg_install.c
===================================================================
--- trunk/src/target/ipkg/ipkg_install.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_install.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,1942 +0,0 @@
-/* ipkg_install.c - 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.
-*/
-
-#include "ipkg.h"
-#include <errno.h>
-#include <dirent.h>
-#include <glob.h>
-#include <time.h>
-#include <signal.h>
-typedef void (*sighandler_t)(int);
-
-#include "pkg.h"
-#include "pkg_hash.h"
-#include "pkg_extract.h"
-
-#include "ipkg_install.h"
-#include "ipkg_configure.h"
-#include "ipkg_download.h"
-#include "ipkg_remove.h"
-
-#include "ipkg_utils.h"
-#include "ipkg_message.h"
-
-#include "sprintf_alloc.h"
-#include "file_util.h"
-#include "str_util.h"
-#include "xsystem.h"
-#include "user.h"
-
-int satisfy_dependencies_for(ipkg_conf_t *conf, pkg_t *pkg);
-static int verify_pkg_installable(ipkg_conf_t *conf, pkg_t *pkg);
-static int unpack_pkg_control_files(ipkg_conf_t *conf, pkg_t *pkg);
-
-static int prerm_upgrade_old_pkg(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg);
-static int prerm_upgrade_old_pkg_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg);
-static int prerm_deconfigure_conflictors(ipkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *conflictors);
-static int prerm_deconfigure_conflictors_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *conflictors);
-static int preinst_configure(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg);
-static int preinst_configure_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg);
-static int check_data_file_clashes(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg);
-static int check_data_file_clashes_change(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg);
-static int check_data_file_clashes_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg);
-static int backup_modified_conffiles(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg);
-static int backup_modified_conffiles_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg);
-static int postrm_upgrade_old_pkg(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg);
-static int postrm_upgrade_old_pkg_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg);
-
-static int remove_obsolesced_files(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg);
-static int install_maintainer_scripts(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg);
-static int remove_disappeared(ipkg_conf_t *conf, pkg_t *pkg);
-static int install_data_files(ipkg_conf_t *conf, pkg_t *pkg);
-static int resolve_conffiles(ipkg_conf_t *conf, pkg_t *pkg);
-
-static int cleanup_temporary_files(ipkg_conf_t *conf, pkg_t *pkg);
-
-static int user_prefers_old_conffile(const char *file, const char *backup);
-
-static char *backup_filename_alloc(const char *file_name);
-static int backup_make_backup(ipkg_conf_t *conf, const char *file_name);
-static int backup_exists_for(const char *file_name);
-static int backup_remove(const char *file_name);
-
-
-int ipkg_install_from_file(ipkg_conf_t *conf, const char *filename)
-{
-     int err, cmp;
-     pkg_t *pkg, *old;
-     char *old_version, *new_version;
-
-     pkg = pkg_new();
-     if (pkg == NULL) {
-	  return ENOMEM;
-     }
-
-     err = pkg_init_from_file(pkg, filename);
-     if (err) {
-	  return err;
-     }
-
-     if (!pkg->architecture) {
-	  ipkg_message(conf, IPKG_ERROR, "Package %s has no Architecture defined.\n", pkg->name);
-	  return -EINVAL;
-     }
-
-     /* XXX: CLEANUP: hash_insert_pkg has a nasty side effect of possibly
-	freeing the pkg that we pass in. It might be nice to clean this up
-	if possible.  */
-     pkg = hash_insert_pkg(&conf->pkg_hash, pkg, 1,conf);
-     old = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg->name);
-
-     pkg->local_filename = strdup(filename);
-
-     if (old) {
-	  old_version = pkg_version_str_alloc(old);
-	  new_version = pkg_version_str_alloc(pkg);
-
-	  cmp = pkg_compare_versions(old, pkg);
-          if ( (conf->force_downgrade==1) && (cmp > 0) ){     /* We've been asked to allow downgrade  and version is precedent */
-             cmp = -1 ;                                       /* then we force ipkg to downgrade */ 
-                                                              /* We need to use a value < 0 because in the 0 case we are asking to */
-                                                              /* reinstall, and some check could fail asking the "force-reinstall" option */
-          } 
-	  if (cmp > 0) {
-	         ipkg_message(conf, IPKG_NOTICE,
-			      "Not downgrading package %s on %s from %s to %s.\n",
-			      old->name, old->dest->name, old_version, new_version);
-	         pkg->state_want = SW_DEINSTALL;
-	         pkg->state_flag |= SF_OBSOLETE;
-	         free(old_version);
-	         free(new_version);
-	         return 0;
-	  } else {
-	       free(old_version);
-	       free(new_version);
-	  }
-     }
-
-     ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__);
-     return ipkg_install_pkg(conf, pkg,0);
-}
-
-ipkg_error_t ipkg_install_by_name(ipkg_conf_t *conf, const char *pkg_name)
-{
-     int cmp;
-     pkg_t *old, *new;
-     char *old_version, *new_version;
-
-     ipkg_message(conf, IPKG_DEBUG2, " Getting old  from pkg_hash_fetch \n" );
-     old = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg_name);
-     if ( old ) 
-        ipkg_message(conf, IPKG_DEBUG2, " Old versions from pkg_hash_fetch %s \n",  old->version );
-    
-     ipkg_message(conf, IPKG_DEBUG2, " Getting new  from pkg_hash_fetch \n" );
-     new = pkg_hash_fetch_best_installation_candidate_by_name(conf, pkg_name);
-     if ( new ) 
-        ipkg_message(conf, IPKG_DEBUG2, " New versions from pkg_hash_fetch %s \n",  new->version );
-
-/* Pigi Basically here is broken the version stuff.
-   What's happening is that nothing provide the version to differents 
-   functions, so the returned struct is always the latest.
-   That's why the install by name don't work.
-*/
-     ipkg_message(conf, IPKG_DEBUG2, " Versions from pkg_hash_fetch in %s ", __FUNCTION__ );
-
-     if ( old ) 
-        ipkg_message(conf, IPKG_DEBUG2, " old %s ", old->version );
-     if ( new ) 
-        ipkg_message(conf, IPKG_DEBUG2, " new %s ", new->version );
-     ipkg_message(conf, IPKG_DEBUG2, " \n");
-
-     if (new == NULL) {
-	  return IPKG_PKG_HAS_NO_CANDIDATE;
-     }
-
-     new->state_flag |= SF_USER;
-     if (old) {
-	  old_version = pkg_version_str_alloc(old);
-	  new_version = pkg_version_str_alloc(new);
-
-	  cmp = pkg_compare_versions(old, new);
-          if ( (conf->force_downgrade==1) && (cmp > 0) ){     /* We've been asked to allow downgrade  and version is precedent */
-	     ipkg_message(conf, IPKG_DEBUG, " Forcing downgrade \n");
-             cmp = -1 ;                                       /* then we force ipkg to downgrade */ 
-                                                              /* We need to use a value < 0 because in the 0 case we are asking to */
-                                                              /* reinstall, and some check could fail asking the "force-reinstall" option */
-          } 
-	  ipkg_message(conf, IPKG_DEBUG, 
-		       "Comparing visible versions of pkg %s:"
-		       "\n\t%s is installed "
-		       "\n\t%s is available "
-		       "\n\t%d was comparison result\n",
-		       pkg_name, old_version, new_version, cmp);
-	  if (cmp == 0 && !conf->force_reinstall) {
-	       ipkg_message(conf, IPKG_NOTICE,
-			    "Package %s (%s) installed in %s is up to date.\n",
-			    old->name, old_version, old->dest->name);
-	       free(old_version);
-	       free(new_version);
-	       return 0;
-	  } else if (cmp > 0) {
-	       ipkg_message(conf, IPKG_NOTICE,
-			    "Not downgrading package %s on %s from %s to %s.\n",
-			    old->name, old->dest->name, old_version, new_version);
-	       free(old_version);
-	       free(new_version);
-	       return 0;
-	  } else if (cmp < 0) {
-	       new->dest = old->dest;
-	       old->state_want = SW_DEINSTALL;    /* Here probably the problem for bug 1277 */
-	  }
-     }
-
-     /* XXX: CLEANUP: The error code of ipkg_install_by_name is really
-	supposed to be an ipkg_error_t, but ipkg_install_pkg could
-	return any kind of integer, (might be errno from a syscall,
-	etc.). This is a real mess and will need to be cleaned up if
-	anyone ever wants to make a nice libipkg. */
-
-     ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__);
-     return ipkg_install_pkg(conf, new,0);
-}
-
-ipkg_error_t ipkg_install_multi_by_name(ipkg_conf_t *conf, const char *pkg_name)
-{
-     abstract_pkg_vec_t *providers = pkg_hash_fetch_all_installation_candidates (&conf->pkg_hash, pkg_name);
-     int i;
-     ipkg_error_t err;
-     abstract_pkg_t *ppkg ;
-
-     if (providers == NULL)
-	  return IPKG_PKG_HAS_NO_CANDIDATE;
-
-     for (i = 0; i < providers->len; i++) {
-	  ppkg = abstract_pkg_vec_get(providers, i);
-          ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i);
-	  err = ipkg_install_by_name(conf, ppkg->name);
-	  if (err)
-	       return err;
-/* XXX Maybe ppkg should be freed ? */
-     }
-     return 0;
-}
-
-/*
- * Walk dependence graph starting with pkg, collect packages to be
- * installed into pkgs_needed, in dependence order.
- */
-int pkg_mark_dependencies_for_installation(ipkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *pkgs_needed)
-{
-     int i, err;
-     pkg_vec_t *depends = pkg_vec_alloc();
-     char **unresolved = NULL;
-     int ndepends;
-
-     ndepends = pkg_hash_fetch_unsatisfied_dependencies(conf, 
-							pkg, depends, 
-							&unresolved);
-
-     if (unresolved) {
-	  ipkg_message(conf, IPKG_ERROR,
-		       "%s: Cannot satisfy the following dependencies for %s:\n\t",
-		       conf->force_depends ? "Warning" : "ERROR", pkg->name);
-	  while (*unresolved) {
-	       ipkg_message(conf, IPKG_ERROR, " %s", *unresolved);
-	       unresolved++;
-	  }
-	  ipkg_message(conf, IPKG_ERROR, "\n");
-	  if (! conf->force_depends) {
-	       ipkg_message(conf, IPKG_INFO,
-			    "This could mean that your package list is out of date or that the packages\n"
-			    "mentioned above do not yet exist (try 'ipkg update'). To proceed in spite\n"
-			    "of this problem try again with the '-force-depends' option.\n");
-	       pkg_vec_free(depends);
-	       return IPKG_PKG_DEPS_UNSATISFIED;
-	  }
-     }
-
-     if (ndepends <= 0) {
-	  pkg_vec_free(depends);
-	  return 0;
-     }
-
-     for (i = 0; i < depends->len; i++) {
-	  pkg_t *dep = depends->pkgs[i];
-	  /* The package was uninstalled when we started, but another
-	     dep earlier in this loop may have depended on it and pulled
-	     it in, so check first. */
-	  if ((dep->state_status != SS_INSTALLED)
-	      && (dep->state_status != SS_UNPACKED)
-	      && (dep->state_want != SW_INSTALL)) {
-
-	       /* Mark packages as to-be-installed */
-	       dep->state_want = SW_INSTALL;
-
-	       /* Dependencies should be installed the same place as pkg */
-	       if (dep->dest == NULL) {
-		    dep->dest = pkg->dest;
-	       }
-
-	       err = pkg_mark_dependencies_for_installation(conf, dep, pkgs_needed);
-	       if (err) {
-		    pkg_vec_free(depends);
-		    return err;
-	       }
-	  }
-     }
-     if (pkgs_needed)
-	  pkg_vec_insert(pkgs_needed, pkg);
-
-     pkg_vec_free(depends);
-
-     return 0;
-}
-
-int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed)
-{
-     int cmp;
-     pkg_t *old, *new;
-     char *old_version, *new_version;
-
-     old = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg_name);
-    
-     new = pkg_hash_fetch_best_installation_candidate_by_name(conf, pkg_name);
-     if (new == NULL) {
-	  return IPKG_PKG_HAS_NO_CANDIDATE;
-     }
-     if (old) {
-	  old_version = pkg_version_str_alloc(old);
-	  new_version = pkg_version_str_alloc(new);
-
-	  cmp = pkg_compare_versions(old, new);
-          if ( (conf->force_downgrade==1) && (cmp > 0) ){     /* We've been asked to allow downgrade  and version is precedent */
-	    ipkg_message(conf, IPKG_DEBUG, " Forcing downgrade ");
-             cmp = -1 ;                                       /* then we force ipkg to downgrade */ 
-                                                              /* We need to use a value < 0 because in the 0 case we are asking to */
-                                                              /* reinstall, and some check could fail asking the "force-reinstall" option */
-          } 
-	  ipkg_message(conf, IPKG_DEBUG, 
-		       "comparing visible versions of pkg %s:"
-		       "\n\t%s is installed "
-		       "\n\t%s is available "
-		       "\n\t%d was comparison result\n",
-		       pkg_name, old_version, new_version, cmp);
-	  if (cmp == 0 && !conf->force_reinstall) {
-	       ipkg_message(conf, IPKG_NOTICE,
-			    "Package %s (%s) installed in %s is up to date.\n",
-			    old->name, old_version, old->dest->name);
-	       free(old_version);
-	       free(new_version);
-	       return 0;
-	  } else if (cmp > 0) {
-	       ipkg_message(conf, IPKG_NOTICE,
-			    "Not downgrading package %s on %s from %s to %s.\n",
-			    old->name, old->dest->name, old_version, new_version);
-	       free(old_version);
-	       free(new_version);
-	       return 0;
-	  } else if (cmp < 0) {
-	       new->dest = old->dest;
-	       old->state_want = SW_DEINSTALL;
-	       old->state_flag |= SF_OBSOLETE;
-	  }
-     }
-     return pkg_mark_dependencies_for_installation(conf, new, pkgs_needed);
-}
-
-
-
-int satisfy_dependencies_for(ipkg_conf_t *conf, pkg_t *pkg)
-{
-     int i, err;
-     pkg_vec_t *depends = pkg_vec_alloc();
-     pkg_t *dep;
-     char **unresolved = NULL;
-     int ndepends;
-
-     ndepends = pkg_hash_fetch_unsatisfied_dependencies(conf, 
-							pkg, depends, 
-							&unresolved);
-
-     if (unresolved) {
-	  ipkg_message(conf, IPKG_ERROR,
-		       "%s: Cannot satisfy the following dependencies for %s:\n\t",
-		       conf->force_depends ? "Warning" : "ERROR", pkg->name);
-	  while (*unresolved) {
-	       ipkg_message(conf, IPKG_ERROR, " %s", *unresolved);
-	       unresolved++;
-	  }
-	  ipkg_message(conf, IPKG_ERROR, "\n");
-	  if (! conf->force_depends) {
-	       ipkg_message(conf, IPKG_INFO,
-			    "This could mean that your package list is out of date or that the packages\n"
-			    "mentioned above do not yet exist (try 'ipkg update'). To proceed in spite\n"
-			    "of this problem try again with the '-force-depends' option.\n");
-	       pkg_vec_free(depends);
-	       return IPKG_PKG_DEPS_UNSATISFIED;
-	  }
-     }
-
-     if (ndepends <= 0) {
-	  return 0;
-     }
-
-     /* Mark packages as to-be-installed */
-     for (i=0; i < depends->len; i++) {
-	  /* Dependencies should be installed the same place as pkg */
-	  if (depends->pkgs[i]->dest == NULL) {
-	       depends->pkgs[i]->dest = pkg->dest;
-	  }
-	  depends->pkgs[i]->state_want = SW_INSTALL;
-     }
-
-     for (i = 0; i < depends->len; i++) {
-	  dep = depends->pkgs[i];
-	  /* The package was uninstalled when we started, but another
-	     dep earlier in this loop may have depended on it and pulled
-	     it in, so check first. */
-	  if ((dep->state_status != SS_INSTALLED)
-	      && (dep->state_status != SS_UNPACKED)) {
-               ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__);
-	       err = ipkg_install_pkg(conf, dep,0);
-	       if (err) {
-		    pkg_vec_free(depends);
-		    return err;
-	       }
-	  }
-     }
-
-     pkg_vec_free(depends);
-
-     return 0;
-}
-
-
-/* check all packages have their dependences satisfied, e.g., in case an upgraded package split */ 
-int ipkg_satisfy_all_dependences(ipkg_conf_t *conf)
-{
-     if (conf->nodeps == 0) {
-	  int i;
-	  pkg_vec_t *installed = pkg_vec_alloc();
-	  pkg_hash_fetch_all_installed(&conf->pkg_hash, installed);
-	  for (i = 0; i < installed->len; i++) {
-	       pkg_t *pkg = installed->pkgs[i];
-	       satisfy_dependencies_for(conf, pkg);
-	  }
-	  pkg_vec_free(installed);
-     }
-     return 0;
-}
-
-
-
-static int check_conflicts_for(ipkg_conf_t *conf, pkg_t *pkg)
-{
-     int i;
-     pkg_vec_t *conflicts = NULL;
-     int level;
-     const char *prefix;
-     if (conf->force_depends) {
-	  level = IPKG_NOTICE;
-	  prefix = "Warning";
-     } else {
-	  level = IPKG_ERROR;
-	  prefix = "ERROR";
-     }
-
-     if (!conf->force_depends)
-	  conflicts = (pkg_vec_t *)pkg_hash_fetch_conflicts(&conf->pkg_hash, pkg);
-
-     if (conflicts) {
-	  ipkg_message(conf, level,
-		       "%s: The following packages conflict with %s:\n\t", prefix, pkg->name);
-	  i = 0;
-	  while (i < conflicts->len)
-	       ipkg_message(conf, level, " %s", conflicts->pkgs[i++]->name);
-	  ipkg_message(conf, level, "\n");
-	  pkg_vec_free(conflicts);
-	  return IPKG_PKG_DEPS_UNSATISFIED;
-     }
-     return 0;
-}
-
-static int update_file_ownership(ipkg_conf_t *conf, pkg_t *new_pkg, pkg_t *old_pkg)
-{
-     str_list_t *new_list = pkg_get_installed_files(new_pkg);
-     str_list_elt_t *iter;
-
-     for (iter = new_list->head; iter; iter = iter->next) {
-	  char *new_file = iter->data;
-	  pkg_t *owner = file_hash_get_file_owner(conf, new_file);
-	  if (!new_file)
-	       ipkg_message(conf, IPKG_ERROR, "Null new_file for new_pkg=%s\n", new_pkg->name);
-	  if (!owner || (owner == old_pkg))
-	       file_hash_set_file_owner(conf, new_file, new_pkg);
-     }
-     if (old_pkg) {
-	  str_list_t *old_list = pkg_get_installed_files(old_pkg);
-	  for (iter = old_list->head; iter; iter = iter->next) {
-	       char *old_file = iter->data;
-	       pkg_t *owner = file_hash_get_file_owner(conf, old_file);
-	       if (owner == old_pkg) {
-		    /* obsolete */
-		    hash_table_insert(&conf->obs_file_hash, old_file, old_pkg);
-	       }
-	  }
-     }
-     return 0;
-}
-
-static int verify_pkg_installable(ipkg_conf_t *conf, pkg_t *pkg)
-{
-    /* XXX: FEATURE: Anything else needed here? Maybe a check on free space? */
-
-    /* sma 6.20.02:  yup; here's the first bit */
-    /* 
-     * XXX: BUG easy for cworth
-     * 1) please point the call below to the correct current root destination
-     * 2) we need to resolve how to check the required space for a pending pkg, 
-     *    my diddling with the .ipk file size below isn't going to cut it.
-     * 3) return a proper error code instead of 1
-     */
-     int comp_size, blocks_available;
-    
-     if (!conf->force_space && pkg->installed_size != NULL) {
-	  blocks_available = get_available_blocks(conf->default_dest->root_dir);
-
-	  comp_size = strtoul(pkg->installed_size, NULL, 0);
-	  /* round up a blocks count without doing fancy-but-slow casting jazz */ 
-	  comp_size = (int)((comp_size + 1023) / 1024);
-
-	  if (comp_size >= blocks_available) {
-	       ipkg_message(conf, IPKG_ERROR,
-			    "Only have %d available blocks on filesystem %s, pkg %s needs %d\n", 
-			    blocks_available, conf->default_dest->root_dir, pkg->name, comp_size);
-	       return ENOSPC;
-	  }
-     }
-     return 0;
-}
-
-static int unpack_pkg_control_files(ipkg_conf_t *conf, pkg_t *pkg)
-{
-     int err;
-     char *conffiles_file_name;
-     char *root_dir;
-     FILE *conffiles_file;
-
-     sprintf_alloc(&pkg->tmp_unpack_dir, "%s/%s-XXXXXX", conf->tmp_dir, pkg->name);
-
-     pkg->tmp_unpack_dir = mkdtemp(pkg->tmp_unpack_dir);
-     if (pkg->tmp_unpack_dir == NULL) {
-	  ipkg_message(conf, IPKG_ERROR,
-		       "%s: Failed to create temporary directory '%s': %s\n",
-		       __FUNCTION__, pkg->tmp_unpack_dir, strerror(errno));
-	  return errno;
-     }
-
-     err = pkg_extract_control_files_to_dir(pkg, pkg->tmp_unpack_dir);
-     if (err) {
-	  return err;
-     }
-
-     /* XXX: CLEANUP: There might be a cleaner place to read in the
-	conffiles. Seems like I should be able to get everything to go
-	through pkg_init_from_file. If so, maybe it would make sense to
-	move all of unpack_pkg_control_files to that function. */
-
-     /* Don't need to re-read conffiles if we already have it */
-     if (pkg->conffiles.head) {
-	  return 0;
-     }
-
-     sprintf_alloc(&conffiles_file_name, "%s/conffiles", pkg->tmp_unpack_dir);
-     if (! file_exists(conffiles_file_name)) {
-	  free(conffiles_file_name);
-	  return 0;
-     }
-    
-     conffiles_file = fopen(conffiles_file_name, "r");
-     if (conffiles_file == NULL) {
-	  fprintf(stderr, "%s: failed to open %s: %s\n",
-		  __FUNCTION__, conffiles_file_name, strerror(errno));
-	  free(conffiles_file_name);
-	  return errno;
-     }
-     free(conffiles_file_name);
-
-     while (1) {
-	  char *cf_name;
-	  char *cf_name_in_dest;
-
-	  cf_name = file_read_line_alloc(conffiles_file);
-	  if (cf_name == NULL) {
-	       break;
-	  }
-	  str_chomp(cf_name);
-	  if (cf_name[0] == '\0') {
-	       continue;
-	  }
-
-	  /* Prepend dest->root_dir to conffile name.
-	     Take pains to avoid multiple slashes. */
-	  root_dir = pkg->dest->root_dir;
-	  if (conf->offline_root)
-	       /* skip the offline_root prefix */
-	       root_dir = pkg->dest->root_dir + strlen(conf->offline_root);
-	  sprintf_alloc(&cf_name_in_dest, "%s%s", root_dir,
-			cf_name[0] == '/' ? (cf_name + 1) : cf_name);
-
-	  /* Can't get an md5sum now, (file isn't extracted yet).
-	     We'll wait until resolve_conffiles */
-	  conffile_list_append(&pkg->conffiles, cf_name_in_dest, NULL);
-
-	  free(cf_name);
-	  free(cf_name_in_dest);
-     }
-
-     fclose(conffiles_file);
-
-     return 0;
-}
-
-/* returns number of installed replacees */
-int pkg_get_installed_replacees(ipkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *installed_replacees)
-{
-     abstract_pkg_t **replaces = pkg->replaces;
-     int replaces_count = pkg->replaces_count;
-     int i, j;
-     for (i = 0; i < replaces_count; i++) {
-	  abstract_pkg_t *ab_pkg = replaces[i];
-	  pkg_vec_t *pkg_vec = ab_pkg->pkgs;
-	  if (pkg_vec) {
-	       for (j = 0; j < pkg_vec->len; j++) {
-		    pkg_t *replacee = pkg_vec->pkgs[j];
-		    if (!pkg_conflicts(pkg, replacee))
-			 continue;
-		    if (replacee->state_status == SS_INSTALLED) {
-			 pkg_vec_insert(installed_replacees, replacee);
-		    }
-	       }
-	  }
-     }
-     return installed_replacees->len;
-}
-
-int pkg_remove_installed_replacees(ipkg_conf_t *conf, pkg_vec_t *replacees)
-{
-     int i;
-     int replaces_count = replacees->len;
-     for (i = 0; i < replaces_count; i++) {
-	  pkg_t *replacee = replacees->pkgs[i];
-	  int err;
-	  replacee->state_flag |= SF_REPLACE; /* flag it so remove won't complain */
-	  err = ipkg_remove_pkg(conf, replacee,0);
-	  if (err)
-	       return err;
-     }
-     return 0;
-}
-
-/* to unwind the removal: make sure they are installed */
-int pkg_remove_installed_replacees_unwind(ipkg_conf_t *conf, pkg_vec_t *replacees)
-{
-     int i, err;
-     int replaces_count = replacees->len;
-     for (i = 0; i < replaces_count; i++) {
-	  pkg_t *replacee = replacees->pkgs[i];
-	  if (replacee->state_status != SS_INSTALLED) {
-               ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__);
-	       err = ipkg_install_pkg(conf, replacee,0);
-	       if (err)
-		    return err;
-	  }
-     }
-     return 0;
-}
-
-int caught_sigint = 0;
-static void ipkg_install_pkg_sigint_handler(int sig)
-{
-     caught_sigint = sig;
-}
-
-/* compares versions of pkg and old_pkg, returns 0 if OK to proceed with installation of pkg, 1 otherwise */
-static int ipkg_install_check_downgrade(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg, int message)
-{	  
-     if (old_pkg) {
-          char message_out[15];
-	  char *old_version = pkg_version_str_alloc(old_pkg);
-	  char *new_version = pkg_version_str_alloc(pkg);
-	  int cmp = pkg_compare_versions(old_pkg, pkg);
-	  int rc = 0;
-
-          memset(message_out,'\x0',15);
-          strncpy (message_out,"Upgrading ",strlen("Upgrading ")); 
-          if ( (conf->force_downgrade==1) && (cmp > 0) ){     /* We've been asked to allow downgrade  and version is precedent */
-             cmp = -1 ;                                       /* then we force ipkg to downgrade */ 
-             strncpy (message_out,"Downgrading ",strlen("Downgrading "));         /* We need to use a value < 0 because in the 0 case we are asking to */
-                                                              /* reinstall, and some check could fail asking the "force-reinstall" option */
-          } 
-
-	  if (cmp > 0) {
-	       ipkg_message(conf, IPKG_NOTICE,
-			    "Not downgrading package %s on %s from %s to %s.\n",
-			    old_pkg->name, old_pkg->dest->name, old_version, new_version);
-	       rc = 1;
-	  } else if (cmp < 0) {
-	       ipkg_message(conf, IPKG_NOTICE,
-			    "%s%s on %s from %s to %s...\n",
-			    message_out, pkg->name, old_pkg->dest->name, old_version, new_version);
-	       pkg->dest = old_pkg->dest;
-	       rc = 0;
-	  } else /* cmp == 0 */ {
-	       if (conf->force_reinstall) {
-		    ipkg_message(conf, IPKG_NOTICE,
-				 "Reinstalling %s (%s) on %s...\n",
-				 pkg->name, new_version, old_pkg->dest->name);
-		    pkg->dest = old_pkg->dest;
-		    rc = 0;
-	       } else {
-		    ipkg_message(conf, IPKG_NOTICE,
-				 "Not installing %s (%s) on %s -- already installed.\n",
-				 pkg->name, new_version, old_pkg->dest->name);
-		    rc = 1;
-	       }
-	  } 
-	  free(old_version);
-	  free(new_version);
-	  return rc;
-     } else {
-      char message_out[15] ;
-      memset(message_out,'\x0',15);
-      if ( message ) 
-          strncpy( message_out,"Upgrading ",strlen("Upgrading ") );
-      else
-          strncpy( message_out,"Installing ",strlen("Installing ") );
-	  char *version = pkg_version_str_alloc(pkg);
-      
-	  ipkg_message(conf, IPKG_NOTICE,
-		       "%s%s (%s) to %s...\n", message_out,
-		       pkg->name, version, pkg->dest->name);
-	  free(version);
-	  return 0;
-     }
-}
-
-/* and now the meat... */
-int ipkg_install_pkg(ipkg_conf_t *conf, pkg_t *pkg, int from_upgrade)
-{
-     int err = 0;
-     int message = 0;
-     pkg_t *old_pkg = NULL;
-     pkg_vec_t *replacees;
-     abstract_pkg_t *ab_pkg = NULL;
-     int old_state_flag;
-     char* file_md5;
-
-    
-     if ( from_upgrade ) 
-        message = 1;            /* Coming from an upgrade, and should change the output message */
-
-     if (!pkg) {
-	  ipkg_message(conf, IPKG_ERROR,
-		       "INTERNAL ERROR: null pkg passed to ipkg_install_pkg\n");
-	  return -EINVAL;
-     }
-
-     ipkg_message(conf, IPKG_DEBUG2, "Function: %s calling pkg_arch_supported %s \n", __FUNCTION__, __FUNCTION__);
-
-     if (!pkg_arch_supported(conf, pkg)) {
-	  ipkg_message(conf, IPKG_ERROR, "INTERNAL ERROR: architecture %s for pkg %s is unsupported.\n",
-		       pkg->architecture, pkg->name);
-	  return -EINVAL;
-     }
-     if (pkg->state_status == SS_INSTALLED && conf->force_reinstall == 0 && conf->nodeps == 0) {
-	  err = satisfy_dependencies_for(conf, pkg);
-	  if (err) { return err; }
-
-	  ipkg_message(conf, IPKG_NOTICE,
-		       "Package %s is already installed in %s.\n", 
-		       pkg->name, pkg->dest->name);
-	  return 0;
-     }
-
-     if (pkg->dest == NULL) {
-	  pkg->dest = conf->default_dest;
-     }
-
-     old_pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg->name);
-
-     err = ipkg_install_check_downgrade(conf, pkg, old_pkg, message);
-     if (err) { return err; }
-
-     pkg->state_want = SW_INSTALL;
-     if (old_pkg){                          
-         old_pkg->state_want = SW_DEINSTALL; /* needed for check_data_file_clashes of dependences */
-     }
-
-
-     /* Abhaya: conflicts check */
-     err = check_conflicts_for(conf, pkg);
-     if (err) { return err; }
-    
-     /* this setup is to remove the upgrade scenario in the end when
-	installing pkg A, A deps B & B deps on A. So both B and A are
-	installed. Then A's installation is started resulting in an
-	uncecessary upgrade */ 
-     if (pkg->state_status == SS_INSTALLED
-	 && conf->force_reinstall == 0) return 0;
-    
-     err = verify_pkg_installable(conf, pkg);
-     if (err) { return err; }
-
-     if (pkg->local_filename == NULL) {
-	  err = ipkg_download_pkg(conf, pkg, conf->tmp_dir);
-	  if (err) {
-	       ipkg_message(conf, IPKG_ERROR,
-			    "Failed to download %s. Perhaps you need to run 'ipkg update'?\n",
-			    pkg->name);
-	       return err;
-	  }
-     }
-
-/* Check for md5 values */
-     if (pkg->md5sum)
-     {
-         file_md5 = file_md5sum_alloc(pkg->local_filename);
-         if (strcmp(file_md5, pkg->md5sum))
-         {
-              ipkg_message(conf, IPKG_ERROR,
-                           "Package %s md5sum mismatch. Either the ipkg or the package index are corrupt. Try 'ipkg update'.\n",
-                           pkg->name);
-              free(file_md5);
-              return err;
-         }
-         free(file_md5);
-     }
-
-     if (pkg->tmp_unpack_dir == NULL) {
-	  unpack_pkg_control_files(conf, pkg);
-     }
-
-     /* We should update the filelist here, so that upgrades of packages that split will not fail. -Jamey 27-MAR-03 */
-/* Pigi: check if it will pass from here when replacing. It seems to fail */
-/* That's rather strange that files don't change owner. Investigate !!!!!!*/
-     err = update_file_ownership(conf, pkg, old_pkg);
-     if (err) { return err; }
-
-     if (conf->nodeps == 0) {
-	  err = satisfy_dependencies_for(conf, pkg);
-	  if (err) { return err; }
-     }
-
-     replacees = pkg_vec_alloc();
-     pkg_get_installed_replacees(conf, pkg, replacees);
-
-     /* this next section we do with SIGINT blocked to prevent inconsistency between ipkg database and filesystem */
-     {
-	  sigset_t newset, oldset;
-	  sighandler_t old_handler = NULL;
-	  int use_signal = 0;
-	  caught_sigint = 0;
-	  if (use_signal) {
-	       old_handler = signal(SIGINT, ipkg_install_pkg_sigint_handler);
-	  } else {
-	       sigemptyset(&newset);
-	       sigaddset(&newset, SIGINT);
-	       sigprocmask(SIG_BLOCK, &newset, &oldset);
-	  }
-
-	  ipkg_state_changed++;
-	  pkg->state_flag |= SF_FILELIST_CHANGED;
-
-	  /* XXX: BUG: we really should treat replacement more like an upgrade
-	   *      Instead, we're going to remove the replacees 
-	   */
-	  err = pkg_remove_installed_replacees(conf, replacees);
-	  if (err) goto UNWIND_REMOVE_INSTALLED_REPLACEES;
-
-	  err = prerm_upgrade_old_pkg(conf, pkg, old_pkg);
-	  if (err) goto UNWIND_PRERM_UPGRADE_OLD_PKG;
-
-	  err = prerm_deconfigure_conflictors(conf, pkg, replacees);
-	  if (err) goto UNWIND_PRERM_DECONFIGURE_CONFLICTORS;
-
-	  err = preinst_configure(conf, pkg, old_pkg);
-	  if (err) goto UNWIND_PREINST_CONFIGURE;
-
-	  err = backup_modified_conffiles(conf, pkg, old_pkg);
-	  if (err) goto UNWIND_BACKUP_MODIFIED_CONFFILES;
-
-	  err = check_data_file_clashes(conf, pkg, old_pkg);
-	  if (err) goto UNWIND_CHECK_DATA_FILE_CLASHES;
-
-	  err = postrm_upgrade_old_pkg(conf, pkg, old_pkg);
-	  if (err) goto UNWIND_POSTRM_UPGRADE_OLD_PKG;
-
-	  if (conf->noaction) return 0;
-
-	  /* point of no return: no unwinding after this */
-	  if (old_pkg && !conf->force_reinstall) {
-	       old_pkg->state_want = SW_DEINSTALL;
-
-	       if (old_pkg->state_flag & SF_NOPRUNE) {
-		    ipkg_message(conf, IPKG_INFO,
-				 "  not removing obsolesced files because package marked noprune\n");
-	       } else {
-		    ipkg_message(conf, IPKG_INFO,
-				 "  removing obsolesced files\n");
-		    remove_obsolesced_files(conf, pkg, old_pkg);
-	       }
-               /* removing files from old package, to avoid ghost files */ 
-               remove_data_files_and_list(conf, old_pkg);
-/* Pigi : It should be better to remove also maintainer and postrem scripts here, just in case*/
-               remove_maintainer_scripts_except_postrm(conf, old_pkg);
-               remove_postrm(conf, old_pkg);
-/* Pigi */
-
-	  }
-
-
-	  ipkg_message(conf, IPKG_INFO,
-		       "  installing maintainer scripts\n");
-	  install_maintainer_scripts(conf, pkg, old_pkg);
-
-	  /* the following just returns 0 */
-	  remove_disappeared(conf, pkg);
-
-	  ipkg_message(conf, IPKG_INFO,
-		       "  installing data files\n");
-	  install_data_files(conf, pkg);
-
-/* read comments from function for detail but I will execute this here as all other tests are ok.*/
-	  err = check_data_file_clashes_change(conf, pkg, old_pkg);
-
-	  ipkg_message(conf, IPKG_INFO,
-		       "  resolving conf files\n");
-	  resolve_conffiles(conf, pkg);
-
-	  pkg->state_status = SS_UNPACKED;
-	  old_state_flag = pkg->state_flag;
-	  pkg->state_flag &= ~SF_PREFER;
-	  ipkg_message(conf, IPKG_DEBUG, "   pkg=%s old_state_flag=%x state_flag=%x\n", pkg->name, old_state_flag, pkg->state_flag);
-
-	  if (old_pkg && !conf->force_reinstall) {
-	       old_pkg->state_status = SS_NOT_INSTALLED;
-	  }
-
-	  time(&pkg->installed_time);
-
-	  ipkg_message(conf, IPKG_INFO,
-		       "  cleanup temp files\n");
-	  cleanup_temporary_files(conf, pkg);
-
-	  ab_pkg = pkg->parent;
-	  if (ab_pkg)
-	       ab_pkg->state_status = pkg->state_status;
-
-	  ipkg_message(conf, IPKG_INFO, "Done.\n");
-
-	  if (use_signal)
-	       signal(SIGINT, old_handler);
-	  else
-	       sigprocmask(SIG_UNBLOCK, &newset, &oldset);
-
-	  return 0;
-     
-
-     UNWIND_POSTRM_UPGRADE_OLD_PKG:
-	  postrm_upgrade_old_pkg_unwind(conf, pkg, old_pkg);
-     UNWIND_CHECK_DATA_FILE_CLASHES:
-	  check_data_file_clashes_unwind(conf, pkg, old_pkg);
-     UNWIND_BACKUP_MODIFIED_CONFFILES:
-	  backup_modified_conffiles_unwind(conf, pkg, old_pkg);
-     UNWIND_PREINST_CONFIGURE:
-	  preinst_configure_unwind(conf, pkg, old_pkg);
-     UNWIND_PRERM_DECONFIGURE_CONFLICTORS:
-	  prerm_deconfigure_conflictors_unwind(conf, pkg, replacees);
-     UNWIND_PRERM_UPGRADE_OLD_PKG:
-	  prerm_upgrade_old_pkg_unwind(conf, pkg, old_pkg);
-     UNWIND_REMOVE_INSTALLED_REPLACEES:
-	  pkg_remove_installed_replacees_unwind(conf, replacees);
-
-	  ipkg_message(conf, IPKG_INFO,
-		       "  cleanup temp files\n");
-	  cleanup_temporary_files(conf, pkg);
-
-	  ipkg_message(conf, IPKG_INFO,
-		       "Failed.\n");
-	  if (use_signal)
-	       signal(SIGINT, old_handler);
-	  else
-	       sigprocmask(SIG_UNBLOCK, &newset, &oldset);
-
-	  return err;
-     }
-}
-
-static int prerm_upgrade_old_pkg(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-     /* DPKG_INCOMPATIBILITY:
-	dpkg does some things here that we don't do yet. Do we care?
-	
-	1. If a version of the package is already installed, call
-	   old-prerm upgrade new-version
-	2. If the script runs but exits with a non-zero exit status
-	   new-prerm failed-upgrade old-version
-	   Error unwind, for both the above cases:
-	   old-postinst abort-upgrade new-version
-     */
-     return 0;
-}
-
-static int prerm_upgrade_old_pkg_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-     /* DPKG_INCOMPATIBILITY:
-	dpkg does some things here that we don't do yet. Do we care?
-	(See prerm_upgrade_old_package for details)
-     */
-     return 0;
-}
-
-static int prerm_deconfigure_conflictors(ipkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *conflictors)
-{
-     /* DPKG_INCOMPATIBILITY:
-	dpkg does some things here that we don't do yet. Do we care?
-	2. If a 'conflicting' package is being removed at the same time:
-		1. If any packages depended on that conflicting package and
-		   --auto-deconfigure is specified, call, for each such package:
-		   deconfigured's-prerm deconfigure \
-		   in-favour package-being-installed version \
-		   removing conflicting-package version
-		Error unwind:
-		   deconfigured's-postinst abort-deconfigure \
-		   in-favour package-being-installed-but-failed version \
-		   removing conflicting-package version
-
-		   The deconfigured packages are marked as requiring
-		   configuration, so that if --install is used they will be
-		   configured again if possible.
-		2. To prepare for removal of the conflicting package, call:
-		   conflictor's-prerm remove in-favour package new-version
-		Error unwind:
-		   conflictor's-postinst abort-remove in-favour package new-version
-     */
-     return 0;
-}
-
-static int prerm_deconfigure_conflictors_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *conflictors)
-{
-     /* DPKG_INCOMPATIBILITY: dpkg does some things here that we don't
-	do yet. Do we care?  (See prerm_deconfigure_conflictors for
-	details) */
-     return 0;
-}
-
-static int preinst_configure(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-     int err;
-     char *preinst_args;
-
-     if (old_pkg) {
-	  char *old_version = pkg_version_str_alloc(old_pkg);
-	  sprintf_alloc(&preinst_args, "upgrade %s", old_version);
-	  free(old_version);
-     } else if (pkg->state_status == SS_CONFIG_FILES) {
-	  char *pkg_version = pkg_version_str_alloc(pkg);
-	  sprintf_alloc(&preinst_args, "install %s", pkg_version);
-	  free(pkg_version);
-     } else {
-	  preinst_args = strdup("install");
-     }
-
-     err = pkg_run_script(conf, pkg, "preinst", preinst_args);
-     if (err) {
-	  ipkg_message(conf, IPKG_ERROR,
-		       "Aborting installation of %s\n", pkg->name);
-	  return 1;
-     }
-
-     free(preinst_args);
-
-     return 0;
-}
-
-static int preinst_configure_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-     /* DPKG_INCOMPATIBILITY:
-	dpkg does the following error unwind, should we?
-	pkg->postrm abort-upgrade old-version
-	OR pkg->postrm abort-install old-version
-	OR pkg->postrm abort-install
-     */
-     return 0;
-}
-
-static int backup_modified_conffiles(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-     int err;
-     conffile_list_elt_t *iter;
-     conffile_t *cf;
-
-     if (conf->noaction) return 0;
-
-     /* Backup all modified conffiles */
-     if (old_pkg) {
-	  for (iter = old_pkg->conffiles.head; iter; iter = iter->next) {
-	       char *cf_name;
-	       
-	       cf = iter->data;
-	       cf_name = root_filename_alloc(conf, cf->name);
-
-	       /* Don't worry if the conffile is just plain gone */
-	       if (file_exists(cf_name) && conffile_has_been_modified(conf, cf)) {
-		    err = backup_make_backup(conf, cf_name);
-		    if (err) {
-			 return err;
-		    }
-	       }
-	       free(cf_name);
-	  }
-     }
-
-     /* Backup all conffiles that were not conffiles in old_pkg */
-     for (iter = pkg->conffiles.head; iter; iter = iter->next) {
-	  char *cf_name;
-	  cf = iter->data;
-	  cf_name = root_filename_alloc(conf, cf->name);
-	  /* Ignore if this was a conffile in old_pkg as well */
-	  if (pkg_get_conffile(old_pkg, cf->name)) {
-	       continue;
-	  }
-
-	  if (file_exists(cf_name) && (! backup_exists_for(cf_name))) {
-	       err = backup_make_backup(conf, cf_name);
-	       if (err) {
-		    return err;
-	       }
-	  }
-	  free(cf_name);
-     }
-
-     return 0;
-}
-
-static int backup_modified_conffiles_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-     conffile_list_elt_t *iter;
-
-     if (old_pkg) {
-	  for (iter = old_pkg->conffiles.head; iter; iter = iter->next) {
-	       backup_remove(iter->data->name);
-	  }
-     }
-
-     for (iter = pkg->conffiles.head; iter; iter = iter->next) {
-	  backup_remove(iter->data->name);
-     }
-
-     return 0;
-}
-
-
-static int check_data_file_clashes(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-     /* DPKG_INCOMPATIBILITY:
-	ipkg takes a slightly different approach than dpkg at this
-	point.  dpkg installs each file in the new package while
-	creating a backup for any file that is replaced, (so that it
-	can unwind if necessary).  To avoid complexity and redundant
-	storage, ipkg doesn't do any installation until later, (at the
-	point at which dpkg removes the backups.
-	
-	But, we do have to check for data file clashes, since after
-	installing a package with a file clash, removing either of the
-	packages involved in the clash has the potential to break the
-	other package.
-     */
-     str_list_t *files_list;
-     str_list_elt_t *iter;
-
-     int clashes = 0;
-
-     files_list = pkg_get_installed_files(pkg);
-     for (iter = files_list->head; iter; iter = iter->next) {
-	  char *root_filename;
-	  char *filename = iter->data;
-	  root_filename = root_filename_alloc(conf, filename);
-	  if (file_exists(root_filename) && (! file_is_dir(root_filename))) {
-	       pkg_t *owner;
-	       pkg_t *obs;
-	       /* Pre-existing conffiles are OK */
-	       /* @@@@ should have way to check that it is a conffile -Jamey */
-	       if (backup_exists_for(root_filename)) {
-		    continue;
-	       }
-
-	       /* Pre-existing files are OK if force-overwrite was asserted. */ 
-	       if (conf->force_overwrite) {
-		    /* but we need to change who owns this file */
-		    file_hash_set_file_owner(conf, filename, pkg);
-		    continue;
-	       }
-
-	       owner = file_hash_get_file_owner(conf, filename);
-
-	       /* Pre-existing files are OK if owned by the pkg being upgraded. */
-	       if (owner && old_pkg) {
-		    if (strcmp(owner->name, old_pkg->name) == 0) {
-			 continue;
-		    }
-	       }
-
-	       /* Pre-existing files are OK if owned by a package replaced by new pkg. */
-	       if (owner) {
-                    ipkg_message(conf, IPKG_DEBUG2, "Checking for replaces for %s in package %s\n", filename, owner->name);
-		    if (pkg_replaces(pkg, owner)) {
-			 continue;
-		    }
-/* If the file that would be installed is owned by the same package, ( as per a reinstall or similar )
-   then it's ok to overwrite. */
-                    if (strcmp(owner->name,pkg->name)==0){
-			 ipkg_message(conf, IPKG_INFO, "Replacing pre-existing file %s owned by package %s\n", filename, owner->name);
-			 continue;
-                    }
-	       }
-
-	       /* Pre-existing files are OK if they are obsolete */
-	       obs = hash_table_get(&conf->obs_file_hash, filename);
-	       if (obs) {
-		    ipkg_message(conf, IPKG_INFO, "Pre-exiting file %s is obsolete.  obs_pkg=%s\n", filename, obs->name);
-		    continue;
-	       }
-
-	       /* We have found a clash. */
-	       ipkg_message(conf, IPKG_ERROR,
-			    "Package %s wants to install file %s\n"
-			    "\tBut that file is already provided by package ",
-			    pkg->name, filename);
-	       if (owner) {
-		    ipkg_message(conf, IPKG_ERROR,
-				 "%s\n", owner->name);
-	       } else {
-		    ipkg_message(conf, IPKG_ERROR,
-				 "<no package>\nPlease move this file out of the way and try again.\n");
-	       }
-	       clashes++;
-	  }
-	  free(root_filename);
-     }
-     pkg_free_installed_files(pkg);
-
-     return clashes;
-}
-
-static int check_data_file_clashes_change(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-    /* Basically that's the worst hack I could do to be able to change ownership of
-       file list, but, being that we have no way to unwind the mods, due to structure
-       of hash table, probably is the quickest hack too, whishing it would not slow-up thing too much.
-       What we do here is change the ownership of file in hash if a replace ( or similar events
-       happens )
-       Only the action that are needed to change name should be considered.
-       @@@ To change after 1.0 release.
-     */
-     str_list_t *files_list;
-     str_list_elt_t *iter;
-
-     int clashes = 0;
-
-     files_list = pkg_get_installed_files(pkg);
-     for (iter = files_list->head; iter; iter = iter->next) {
-	  char *root_filename;
-	  char *filename = iter->data;
-	  root_filename = root_filename_alloc(conf, filename);
-	  if (file_exists(root_filename) && (! file_is_dir(root_filename))) {
-	       pkg_t *owner;
-
-	       if (conf->force_overwrite) {
-		    /* but we need to change who owns this file */
-		    file_hash_set_file_owner(conf, filename, pkg);
-		    continue;
-	       }
-
-	       owner = file_hash_get_file_owner(conf, filename);
-
-	       /* Pre-existing files are OK if owned by a package replaced by new pkg. */
-	       if (owner) {
-		    if (pkg_replaces(pkg, owner)) {
-/* It's now time to change the owner of that file. 
-   It has been "replaced" from the new "Replaces", then I need to inform lists file about that.  */
-			 ipkg_message(conf, IPKG_INFO, "Replacing pre-existing file %s owned by package %s\n", filename, owner->name);
-		         file_hash_set_file_owner(conf, filename, pkg);
-			 continue;
-		    }
-	       }
-
-	  }
-	  free(root_filename);
-     }
-     pkg_free_installed_files(pkg);
-
-     return clashes;
-}
-
-static int check_data_file_clashes_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-     /* Nothing to do since check_data_file_clashes doesn't change state */
-     return 0;
-}
-
-static int postrm_upgrade_old_pkg(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-     /* DPKG_INCOMPATIBILITY: dpkg does the following here, should we?
-	1. If the package is being upgraded, call
-	   old-postrm upgrade new-version
-	2. If this fails, attempt:
-	   new-postrm failed-upgrade old-version
-	Error unwind, for both cases:
-	   old-preinst abort-upgrade new-version    */
-     return 0;
-}
-
-static int postrm_upgrade_old_pkg_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-     /* DPKG_INCOMPATIBILITY:
-	dpkg does some things here that we don't do yet. Do we care?
-	(See postrm_upgrade_old_pkg for details)
-     */
-    return 0;
-}
-
-static int remove_obsolesced_files(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-     int err;
-     str_list_t *old_files;
-     str_list_elt_t *of;
-     str_list_t *new_files;
-     str_list_elt_t *nf;
-
-     if (old_pkg == NULL) {
-	  return 0;
-     }
-
-     old_files = pkg_get_installed_files(old_pkg);
-     new_files = pkg_get_installed_files(pkg);
-
-     for (of = old_files->head; of; of = of->next) {
-	  pkg_t *owner;
-	  char *old, *new;
-	  old = of->data;
-	  for (nf = new_files->head; nf; nf = nf->next) {
-	       new = nf->data;
-	       if (strcmp(old, new) == 0) {
-		    goto NOT_OBSOLETE;
-	       }
-	  }
-	  if (file_is_dir(old)) {
-	       continue;
-	  }
-	  owner = file_hash_get_file_owner(conf, old);
-	  if (owner != old_pkg) {
-	       /* in case obsolete file no longer belongs to old_pkg */
-	       continue;
-	  }
- 
-	  /* old file is obsolete */
-	  ipkg_message(conf, IPKG_INFO,
-		       "    removing obsolete file %s\n", old);
-	  if (!conf->noaction) {
-	       err = unlink(old);
-	       if (err) {
-		    ipkg_message(conf, IPKG_ERROR, "    Warning: remove %s failed: %s\n", old,
-				 strerror(errno));
-	       }
-	  }
-
-     NOT_OBSOLETE:
-	  ;
-     }
-
-     pkg_free_installed_files(old_pkg);
-     pkg_free_installed_files(pkg);
-
-     return 0;
-}
-
-static int remove_obsolete_maintainer_scripts(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-     int i;
-     int err = 0;
-     char *globpattern;
-     glob_t globbuf;
-     if (0) {
-	  if (!pkg->dest) {
-	       ipkg_message(conf, IPKG_ERROR, "%s: no dest for package %s\n", __FUNCTION__, pkg->name);
-	       return -1;
-	  }
-	  sprintf_alloc(&globpattern, "%s/%s.*", pkg->dest->info_dir, pkg->name);
-	  err = glob(globpattern, 0, NULL, &globbuf);
-	  free(globpattern);
-	  if (err) {
-	       return err;
-	  }
-	  /* XXXX this should perhaps only remove the ones that are not overwritten in new package.  Jamey 11/11/2003 */
-	  for (i = 0; i < globbuf.gl_pathc; i++) {
-	       ipkg_message(conf, IPKG_DEBUG, "Removing control file %s from old_pkg %s\n",
-			    globbuf.gl_pathv[i], old_pkg->name);
-	       if (!conf->noaction)
-		    unlink(globbuf.gl_pathv[i]);
-	  }
-	  globfree(&globbuf);
-     }
-     return err;
-}
-
-static int install_maintainer_scripts(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg)
-{
-     int ret;
-     char *prefix;
-
-     if (old_pkg)
-	  remove_obsolete_maintainer_scripts(conf, pkg, old_pkg);
-     sprintf_alloc(&prefix, "%s.", pkg->name);
-     ret = pkg_extract_control_files_to_dir_with_prefix(pkg,
-							pkg->dest->info_dir,
-							prefix);
-     free(prefix);
-     return ret;
-}
-
-static int remove_disappeared(ipkg_conf_t *conf, pkg_t *pkg)
-{
-     /* DPKG_INCOMPATIBILITY:
-	This is a fairly sophisticated dpkg operation. Shall we
-	skip it? */
-     
-     /* Any packages all of whose files have been overwritten during the
-	installation, and which aren't required for dependencies, are
-	considered to have been removed. For each such package
-	1. disappearer's-postrm disappear overwriter overwriter-version
-	2. The package's maintainer scripts are removed
-	3. It is noted in the status database as being in a sane state,
-           namely not installed (any conffiles it may have are ignored,
-	   rather than being removed by dpkg). Note that disappearing
-	   packages do not have their prerm called, because dpkg doesn't
-	   know in advance that the package is going to vanish.
-     */
-     return 0;
-}
-
-static int install_data_files(ipkg_conf_t *conf, pkg_t *pkg)
-{
-     int err;
-
-     /* ipkg takes a slightly different approach to data file backups
-	than dpkg. Rather than removing backups at this point, we
-	actually do the data file installation now. See comments in
-	check_data_file_clashes() for more details. */
-    
-     ipkg_message(conf, IPKG_INFO,
-		  "    extracting data files to %s\n", pkg->dest->root_dir);
-     err = pkg_extract_data_files_to_dir(pkg, pkg->dest->root_dir);
-     if (err) {
-	  return err;
-     }
-
-     /* XXX: BUG or FEATURE : We are actually loosing the Essential flag,
-        so we can't save ourself from removing important packages
-        At this point we (should) have extracted the .control file, so it
-        would be a good idea to reload the data in it, and set the Essential 
-        state in *pkg. From now on the Essential is back in status file and
-        we can protect again.
-        We should operate this way:
-        fopen the file ( pkg->dest->root_dir/pkg->name.control )
-        check for "Essential" in it 
-        set the value in pkg->essential.
-        This new routine could be useful also for every other flag
-        Pigi: 16/03/2004 */
-     set_flags_from_control(conf, pkg) ;
-     
-     ipkg_message(conf, IPKG_DEBUG, "    Calling pkg_write_filelist from %s\n", __FUNCTION__);
-     err = pkg_write_filelist(conf, pkg);
-     if (err)
-	  return err;
-
-     /* XXX: FEATURE: ipkg should identify any files which existed
-	before installation and which were overwritten, (see
-	check_data_file_clashes()). What it must do is remove any such
-	files from the filelist of the old package which provided the
-	file. Otherwise, if the old package were removed at some point
-	it would break the new package. Removing the new package will
-	also break the old one, but this cannot be helped since the old
-	package's file has already been deleted. This is the importance
-	of check_data_file_clashes(), and only allowing ipkg to install
-	a clashing package with a user force. */
-
-     return 0;
-}
-
-static int resolve_conffiles(ipkg_conf_t *conf, pkg_t *pkg)
-{
-     conffile_list_elt_t *iter;
-     conffile_t *cf;
-     char *cf_backup;
-
-    char *md5sum;
-
-    
-     if (conf->noaction) return 0;
-
-     for (iter = pkg->conffiles.head; iter; iter = iter->next) {
-	  char *root_filename;
-	  cf = iter->data;
-	  root_filename = root_filename_alloc(conf, cf->name);
-
-	  /* Might need to initialize the md5sum for each conffile */
-	  if (cf->value == NULL) {
-	       cf->value = file_md5sum_alloc(root_filename);
-	  }
-
-	  if (!file_exists(root_filename)) {
-	       free(root_filename);
-	       continue;
-	  }
-
-	  cf_backup = backup_filename_alloc(root_filename);
-
-
-	  if (file_exists(cf_backup)) {
- /* Let's compute md5 to test if files are changed */
-	      md5sum = file_md5sum_alloc(cf_backup);
-               if (strcmp( cf->value,md5sum) != 0 ) {
-	          if (conf->force_defaults
-		      || user_prefers_old_conffile(cf->name, cf_backup) ) {
-		       rename(cf_backup, root_filename);
-	          }
-	       }
-	       unlink(cf_backup);
-	       free(md5sum);
-	  }
-
-	  free(cf_backup);
-	  free(root_filename);
-     }
-
-     return 0;
-}
-
-static int user_prefers_old_conffile(const char *file_name, const char *backup)
-{
-     char *response;
-     const char *short_file_name;
-
-     short_file_name = strrchr(file_name, '/');
-     if (short_file_name) {
-	  short_file_name++;
-     } else {
-	  short_file_name = file_name;
-     }
-
-     while (1) {
-	  response = get_user_response("    Configuration file '%s'\n"
-				       "    ==> File on system created by you or by a script.\n"
-				       "    ==> File also in package provided by package maintainer.\n"
-				       "       What would you like to do about it ?  Your options are:\n"
-				       "        Y or I  : install the package maintainer's version\n"
-				       "        N or O  : keep your currently-installed version\n"
-				       "          D     : show the differences between the versions (if diff is installed)\n"
-				       "     The default action is to keep your current version.\n"
-				       "    *** %s (Y/I/N/O/D) [default=N] ? ", file_name, short_file_name);
-	  if (strcmp(response, "y") == 0
-	      || strcmp(response, "i") == 0
-	      || strcmp(response, "yes") == 0) {
-	       free(response);
-	       return 0;
-	  }
-
-	  if (strcmp(response, "d") == 0) {
-	       char *cmd;
-
-	       free(response);
-	       /* XXX: BUG rewrite to use exec or busybox's internal diff */
-	       sprintf_alloc(&cmd, "diff -u %s %s", backup, file_name);
-	       xsystem(cmd);
-	       free(cmd);
-	       printf("    [Press ENTER to continue]\n");
-	       response = file_read_line_alloc(stdin);
-	       free(response);
-	       continue;
-	  }
-
-	  free(response);
-	  return 1;
-     }
-}
-
-/* XXX: CLEANUP: I'd like to move all of the code for
-   creating/cleaning pkg->tmp_unpack_dir directly into pkg.c. (Then,
-   it would make sense to cleanup pkg->tmp_unpack_dir directly from
-   pkg_deinit for example). */
-static int cleanup_temporary_files(ipkg_conf_t *conf, pkg_t *pkg)
-{
-     DIR *tmp_dir;
-     struct dirent *dirent;
-     char *tmp_file;
-
-#ifdef IPKG_DEBUG_NO_TMP_CLEANUP
-#error
-     ipkg_message(conf, IPKG_DEBUG,
-		  "%s: Not cleaning up %s since ipkg compiled with IPKG_DEBUG_NO_TMP_CLEANUP\n",
-		  __FUNCTION__, pkg->tmp_unpack_dir);
-     return 0;
-#endif
-
-     if (pkg->tmp_unpack_dir && file_is_dir(pkg->tmp_unpack_dir)) {
-	  tmp_dir = opendir(pkg->tmp_unpack_dir);
-	  if (tmp_dir) {
-	       while (1) {
-		    dirent = readdir(tmp_dir);
-		    if (dirent == NULL) {
-			 break;
-		    }
-		    sprintf_alloc(&tmp_file, "%s/%s",
-				  pkg->tmp_unpack_dir, dirent->d_name);
-		    if (! file_is_dir(tmp_file)) {
-			 unlink(tmp_file);
-		    }
-		    free(tmp_file);
-	       }
-	       closedir(tmp_dir);
-	       rmdir(pkg->tmp_unpack_dir);
-	       free(pkg->tmp_unpack_dir);
-	       pkg->tmp_unpack_dir = NULL;
-	  }
-     }
-
-     ipkg_message(conf, IPKG_INFO, "cleanup_temporary_files: pkg=%s local_filename=%s tmp_dir=%s\n",
-		  pkg->name, pkg->local_filename, conf->tmp_dir);
-     if (pkg->local_filename && strncmp(pkg->local_filename, conf->tmp_dir, strlen(conf->tmp_dir)) == 0) {
-	  unlink(pkg->local_filename);
-	  free(pkg->local_filename);
-	  pkg->local_filename = NULL;
-     }
-
-     return 0;
-}
-
-static char *backup_filename_alloc(const char *file_name)
-{
-     char *backup;
-
-     sprintf_alloc(&backup, "%s%s", file_name, IPKG_BACKUP_SUFFIX);
-
-     return backup;
-}
-
-int backup_make_backup(ipkg_conf_t *conf, const char *file_name)
-{
-     int err;
-     char *backup;
-    
-     backup = backup_filename_alloc(file_name);
-     err = file_copy(file_name, backup);
-     if (err) {
-	  ipkg_message(conf, IPKG_ERROR,
-		       "%s: Failed to copy %s to %s\n",
-		       __FUNCTION__, file_name, backup);
-     }
-
-     free(backup);
-
-     return err;
-}
-
-static int backup_exists_for(const char *file_name)
-{
-     int ret;
-     char *backup;
-
-     backup = backup_filename_alloc(file_name);
-
-     ret = file_exists(backup);
-
-     free(backup);
-
-     return ret;
-}
-
-static int backup_remove(const char *file_name)
-{
-     char *backup;
-
-     backup = backup_filename_alloc(file_name);
-     unlink(backup);
-     free(backup);
-
-     return 0;
-}
-
-
-
-#ifdef CONFIG_IPKG_PROCESS_ACTIONS
-
-int ipkg_remove_packages(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_remove) 
-{
-     /* first, remove the packages that need removing */
-     for (i = 0 ; i < pkgs_to_remove->len; i++ ) {
-	  pkg_t *pkg = pkgs_to_remove->pkgs[i];
-	  err = ipkg_remove_pkg(conf, pkg,0);
-	  if (err) return err;
-     }
-     return 0;
-}
-
-int ipkg_process_actions_sanity_check(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_remove, pkg_vec_t *pkgs_superseded, pkg_vec_t *pkgs_to_install)
-{
-     int i;
-     /* now one more pass checking on the ones that need to be installed */
-     for (i = 0 ; i < pkgs_to_install->len; i++ ) {
-	  pkg_t *pkg = pkgs_to_install->pkgs[i];
-	  if (pkg->dest == NULL)
-	       pkg->dest = conf->default_dest;
-
-	  pkg->state_want = SW_INSTALL;
-
-	  /* Abhaya: conflicts check */
-	  err = check_conflicts_for(conf, pkg);
-	  if (err) { return err; }
-     }
-     return 0;
-}
-
-int ipkg_process_actions_unpack_packages(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_remove, pkg_vec_t *pkgs_to_install)
-{
-     int i;
-     /* now one more pass checking on the ones that need to be installed */
-     for (i = 0 ; i < pkgs_to_install->len; i++ ) {
-	  pkg_t *pkg = pkgs_to_install->pkgs[i];
-
-	  /* XXX: FEATURE: Need to really support Provides/Replaces: here at some point */
-	  pkg_vec_t *replacees = pkg_vec_alloc();
-	  pkg_get_installed_replacees(conf, pkg, replacees);
-
-	  /* XXX: BUG: we really should treat replacement more like an upgrade
-	   *      Instead, we're going to remove the replacees 
-	   */
-	  err = pkg_remove_installed_replacees(conf, replacees);
-	  if (err) return err;
-	  pkg->state_flag |= SF_REMOVED_REPLACEES;
-     }
-     return 0;
-}
-
-int ipkg_process_actions_unpack_packages(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_remove, pkg_vec_t *pkgs_to_install)
-{
-     int i;
-     /* now one more pass checking on the ones that need to be installed */
-     for (i = 0 ; i < pkgs_to_install->len; i++ ) {
-	  pkg_t *pkg = pkgs_to_install->pkgs[i];
-	  if (pkg->local_filename == NULL) {
-	       err = ipkg_download_pkg(conf, pkg, conf->tmp_dir);
-	       if (err) {
-		    ipkg_message(conf, IPKG_ERROR,
-				 "Failed to download %s. Perhaps you need to run 'ipkg update'?\n",
-				 pkg->name);
-		    return err;
-	       }
-	  }
-	  if (pkg->tmp_unpack_dir == NULL) {
-	       err = unpack_pkg_control_files(conf, pkg);
-	       if (err) return err;
-	  }
-     }
-     return 0;
-}
-
-int ipkg_process_actions_prerm(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_install)
-{
-     int i;
-     /* now one more pass checking on the ones that need to be installed */
-     for (i = 0 ; i < pkgs_to_install->len; i++ ) {
-	  pkg_t *pkg = pkgs_to_install->pkgs[i];
-	  pkg_t *old_pkg = pkg->old_pkg;
-
-	  err = prerm_upgrade_old_pkg(conf, pkg, old_pkg);
-	  if (err) return err;
-
-	  err = prerm_deconfigure_conflictors(conf, pkg, replacees);
-	  if (err) return err;
-
-	  err = preinst_configure(conf, pkg, old_pkg);
-	  if (err) return err;
-
-	  err = backup_modified_conffiles(conf, pkg, old_pkg);
-	  if (err) return err;
-
-	  err = postrm_upgrade_old_pkg(conf, pkg, old_pkg);
-	  if (err) return err;
-     }
-     return 0;
-}
-
-int ipkg_process_actions_install(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_install)
-{
-     int i;
-     /* now one more pass checking on the ones that need to be installed */
-     for (i = 0 ; i < pkgs_to_install->len; i++ ) {
-	  pkg_t *pkg = pkgs_to_install->pkgs[i];
-	  pkg_t *old_pkg = pkg->old_pkg;
-
-	  if (old_pkg) {
-	       old_pkg->state_want = SW_DEINSTALL;
-
-	       if (old_pkg->state_flag & SF_NOPRUNE) {
-		    ipkg_message(conf, IPKG_INFO,
-				 "  not removing obsolesced files because package marked noprune\n");
-	       } else {
-		    ipkg_message(conf, IPKG_INFO,
-				 "  removing obsolesced files\n");
-		    remove_obsolesced_files(conf, pkg, old_pkg);
-	       }
-	  }
-
-	  ipkg_message(conf, IPKG_INFO,
-		       "  installing maintainer scripts\n");
-	  install_maintainer_scripts(conf, pkg, old_pkg);
-
-	  /* the following just returns 0 */
-	  remove_disappeared(conf, pkg);
-
-	  ipkg_message(conf, IPKG_INFO,
-		       "  installing data files\n");
-	  install_data_files(conf, pkg);
-
-	  ipkg_message(conf, IPKG_INFO,
-		       "  resolving conf files\n");
-	  resolve_conffiles(conf, pkg);
-
-	  pkg->state_status = SS_UNPACKED;
-
-	  if (old_pkg) {
-	       old_pkg->state_status = SS_NOT_INSTALLED;
-	  }
-
-	  time(&pkg->installed_time);
-
-	  ipkg_message(conf, IPKG_INFO,
-		       "  cleanup temp files\n");
-	  cleanup_temporary_files(conf, pkg);
-
-	  if (pkg->parent)
-	       pkg->parent->state_status = pkg->state_status;
-     }
-     return 0;
-}
-
-int ipkg_process_actions_unwind_prerm(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_install)
-{
-     int i;
-     /* now one more pass checking on the ones that need to be installed */
-     for (i = 0 ; i < pkgs_to_install->len; i++ ) {
-	  pkg_t *pkg = pkgs_to_install->pkgs[i];
-	  pkg_t *old_pkg = pkg->old_pkg;
-
-	  if (old_pkg) {
-	       if (old_pkg->state_flags & SF_POSTRM_UPGRADE)
-		    postrm_upgrade_old_pkg_unwind(conf, pkg, old_pkg);
-	       if (old_pkg->state_flags & SF_CHECK_DATA_FILE_CLASHES)
-		    check_data_file_clashes_unwind(conf, pkg, old_pkg);
-	       if (old_pkg->state_flags & SF_BACKUP_MODIFIED_CONFFILES)
-		    backup_modified_conffiles_unwind(conf, pkg, old_pkg);
-	       if (old_pkg->state_flags & SF_PREINST_CONFIGURE)
-		    preinst_configure_unwind(conf, pkg, old_pkg);
-	       if (old_pkg->state_flags & SF_DECONFIGURE_CONFLICTORS)
-		    prerm_deconfigure_conflictors_unwind(conf, pkg, replacees);
-	       if (old_pkg->state_flags & SF_PRERM_UPGRADE)
-		    prerm_upgrade_old_pkg_unwind(conf, pkg, old_pkg);
-
-	       if (old_pkg->state_flags & SF_REMOVED_REPLACEES)
-		    remove_installed_replacees_unwind(conf, pkg, old_pkg);
-
-	  }
-     }
-     return 0;
-}
-
-/* 
- * Perform all the actions.
- *
- * pkgs_to_remove are packages marked for removal.
- * pkgs_superseded are the old packages being replaced by upgrades.
- *
- * Assumes pkgs_to_install includes all dependences, recursively, sorted in installable order.
- */
-int ipkg_process_actions(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_remove, pkg_vec_t *pkgs_superseded, pkg_vec_t *pkgs_to_install)
-{
-     int err;
-     int i;
-
-     err = ipkg_remove_packages(conf, pkgs_to_remove);
-     if (err) return err;
-
-     err = ipkg_process_actions_sanity_check(conf, pkgs_superseded, pkgs_to_install);
-     if (err) return err;
-
-     err = ipkg_process_actions_remove_replacees(conf, pkgs_to_install);
-     if (err) goto UNWIND;
-
-     /* @@@@ look at ipkg_install_pkg for handling replacements */
-     err = ipkg_process_actions_unpack_packages(conf, pkgs_to_install);
-     if (err) goto UNWIND;
-
-     /* 
-      * Now that we have the packages unpacked, we can look for data
-      * file clashes.  First, we mark the files from the superseded
-      * packages as obsolete.  Then we scan the files in
-      * pkgs_to_install, and only complain about clashes with
-      * non-obsolete files.
-      */
-
-     err = ipkg_process_actions_check_data_file_clashes(conf, pkgs_superseded, pkgs_to_install);
-     if (err) goto UNWIND;
-
-     /* this was before checking data file clashes */
-     err = ipkg_process_actions_prerm(conf, pkgs_superseded, pkgs_to_install);
-     if (err) goto UNWIND;
-
-     /* point of no return: no unwinding after this */
-     err = ipkg_process_actions_install(conf, pkgs_to_install);
-     if (err) return err;
-
-     ipkg_message(conf, IPKG_INFO, "Done.\n");
-     return 0;
-
- UNWIND:
-     ipkg_process_actions_unwind(conf, pkgs_to_install);
-
-     ipkg_message(conf, IPKG_INFO,
-		  "  cleanup temp files\n");
-     cleanup_temporary_files(conf, pkg);
-
-     ipkg_message(conf, IPKG_INFO,
-		  "Failed.\n");
-     return err;
-}
-
-#endif

Deleted: trunk/src/target/opkg/ipkg_install.h
===================================================================
--- trunk/src/target/ipkg/ipkg_install.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_install.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,35 +0,0 @@
-/* ipkg_install.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 IPKG_INSTALL_H
-#define IPKG_INSTALL_H
-
-#include "pkg.h"
-#include "ipkg_conf.h"
-
-ipkg_error_t ipkg_install_by_name(ipkg_conf_t *conf, const char *pkg_name);
-ipkg_error_t ipkg_install_multi_by_name(ipkg_conf_t *conf, const char *pkg_name);
-int ipkg_install_from_file(ipkg_conf_t *conf, const char *filename);
-int ipkg_install_pkg(ipkg_conf_t *conf, pkg_t *pkg,int from_upgrading);
-int satisfy_dependencies_for(ipkg_conf_t *conf, pkg_t *pkg);
-
-int ipkg_satisfy_all_dependences(ipkg_conf_t *conf);
-
-int pkg_mark_dependencies_for_installation(ipkg_conf_t *conf, pkg_t *pkg_name, pkg_vec_t *pkgs_needed);
-int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed);
-
-#endif

Deleted: trunk/src/target/opkg/ipkg_message.c
===================================================================
--- trunk/src/target/ipkg/ipkg_message.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_message.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,61 +0,0 @@
-/* ipkg_message.c - the itsy package management system
-
-   Copyright (C) 2003 Daniele Nicolodi <daniele at grinta.net>
-
-   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 "ipkg.h"
-#include "ipkg_conf.h"
-#include "ipkg_message.h"
-
-#ifndef IPKG_LIB
-
-void
-ipkg_message (ipkg_conf_t * conf, message_level_t level, char *fmt, ...)
-{
-	va_list ap;
-
-	if (conf && (conf->verbosity < level))
-	{
-		return;
-	}
-	else
-	{
-
-		va_start (ap, fmt);
-		vprintf (fmt, ap);
-		va_end (ap);
-	}
-}
-
-#else
-
-#include "libipkg.h"
-
-//#define ipkg_message(conf, level, fmt, arg...) ipkg_cb_message(conf, level, fmt, ## arg)
-
-void
-ipkg_message (ipkg_conf_t * conf, message_level_t level, char *fmt, ...)
-{
-	va_list ap;
-	char ts[256];
-
-	if (ipkg_cb_message)
-	{
-		va_start (ap, fmt);
-		vsnprintf (ts,256,fmt, ap);
-		va_end (ap);
-		ipkg_cb_message(conf,level,ts);
-	}
-}
-#endif

Deleted: trunk/src/target/opkg/ipkg_message.h
===================================================================
--- trunk/src/target/ipkg/ipkg_message.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_message.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,32 +0,0 @@
-/* ipkg_message.h - the itsy package management system
-
-   Copyright (C) 2003 Daniele Nicolodi <daniele at grinta.net>
-
-   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 _IPKG_MESSAGE_H_
-#define _IPKG_MESSAGE_H_
-
-#include "ipkg.h"
-#include "ipkg_conf.h"
-
-typedef enum {
-     IPKG_ERROR,	/* error conditions */
-     IPKG_NOTICE,	/* normal but significant condition */
-     IPKG_INFO,		/* informational message */
-     IPKG_DEBUG,	/* debug level message */
-     IPKG_DEBUG2,	/* more debug level message */
-} message_level_t;
-
-extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, char *fmt, ...);
-
-#endif /* _IPKG_MESSAGE_H_ */

Deleted: trunk/src/target/opkg/ipkg_remove.c
===================================================================
--- trunk/src/target/ipkg/ipkg_remove.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_remove.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,383 +0,0 @@
-/* ipkg_remove.c - 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.
-*/
-
-#include "ipkg.h"
-#include "ipkg_message.h"
-
-#include <glob.h>
-
-#include "ipkg_remove.h"
-
-#include "file_util.h"
-#include "sprintf_alloc.h"
-#include "str_util.h"
-
-#include "ipkg_cmd.h"
-
-/*
- * Returns number of the number of packages depending on the packages provided by this package.
- * Every package implicitly provides itself.
- */
-int pkg_has_installed_dependents(ipkg_conf_t *conf, abstract_pkg_t *parent_apkg, pkg_t *pkg, abstract_pkg_t *** pdependents)
-{
-     int nprovides = pkg->provides_count;
-     abstract_pkg_t **provides = pkg->provides;
-     int n_installed_dependents = 0;
-     int i;
-     for (i = 0; i <= nprovides; i++) {
-	  abstract_pkg_t *providee = provides[i];
-	  abstract_pkg_t **dependers = providee->depended_upon_by;
-	  abstract_pkg_t *dep_ab_pkg;
-	  if (dependers == NULL)
-	       continue;
-	  while ((dep_ab_pkg = *dependers++) != NULL) {
-	       if (dep_ab_pkg->state_status == SS_INSTALLED){
-		    n_installed_dependents++;
-               }
-	  }
-
-     }
-     /* if caller requested the set of installed dependents */
-     if (pdependents) {
-	  int p = 0;
-	  abstract_pkg_t **dependents = (abstract_pkg_t **)malloc((n_installed_dependents+1)*sizeof(abstract_pkg_t *));
-
-          if ( dependents == NULL ){
-              fprintf(stderr,"%s Unable to allocate memory. REPORT THIS BUG IN BUGZILLA PLEASE\n", __FUNCTION__);
-              return -1;  
-          }
-
-	  *pdependents = dependents;
-	  for (i = 0; i <= nprovides; i++) {
-	       abstract_pkg_t *providee = provides[i];
-	       abstract_pkg_t **dependers = providee->depended_upon_by;
-	       abstract_pkg_t *dep_ab_pkg;
-	       if (dependers == NULL)
-		    continue;
-	       while ((dep_ab_pkg = *dependers++) != NULL) {
-		    if (dep_ab_pkg->state_status == SS_INSTALLED && !(dep_ab_pkg->state_flag & SF_MARKED)) {
-			 dependents[p++] = dep_ab_pkg;
-			 dep_ab_pkg->state_flag |= SF_MARKED;
-		    }
-	       }
-	  }
-	  dependents[p] = NULL;
-	  /* now clear the marks */
-	  for (i = 0; i < p; i++) {
-	       abstract_pkg_t *dep_ab_pkg = dependents[i];
-	       dep_ab_pkg->state_flag &= ~SF_MARKED;
-	  }
-     }
-     return n_installed_dependents;
-}
-
-int ipkg_remove_dependent_pkgs (ipkg_conf_t *conf, pkg_t *pkg, abstract_pkg_t **dependents)
-{
-    int i;
-    int a;
-    int count;
-    pkg_vec_t *dependent_pkgs = pkg_vec_alloc();
-    abstract_pkg_t * ab_pkg;
-
-    if((ab_pkg = pkg->parent) == NULL){
-	fprintf(stderr, "%s: unable to get dependent pkgs. pkg %s isn't in hash table\n",
-		__FUNCTION__, pkg->name);
-	return 0;
-    }
-    
-    if (dependents == NULL)
-	    return 0;
-
-    // here i am using the dependencies_checked
-    if (ab_pkg->dependencies_checked == 2) // variable to make out whether this package
-	return 0;			   // has already been encountered in the process
-	                                   // of marking packages for removal - Karthik
-    ab_pkg->dependencies_checked = 2;
-
-    i = 0;
-    count = 1;
-    while (dependents [i] != NULL) {
-        abstract_pkg_t *dep_ab_pkg = dependents[i];
-	
-	if (dep_ab_pkg->dependencies_checked == 2){
-	    i++;
-	    continue;	
-        }
-        if (dep_ab_pkg->state_status == SS_INSTALLED) {
-            for (a = 0; a < dep_ab_pkg->pkgs->len; a++) {
-                pkg_t *dep_pkg = dep_ab_pkg->pkgs->pkgs[a];
-                if (dep_pkg->state_status == SS_INSTALLED) {
-                    pkg_vec_insert(dependent_pkgs, dep_pkg);
-                    count++;
-                }
-            }
-        }
-	i++;
-	/* 1 - to keep track of visited ab_pkgs when checking for possiblility of a broken removal of pkgs.
-	 * 2 - to keep track of pkgs whose deps have been checked alrdy  - Karthik */	
-    }
-    
-    if (count == 1)
-	    return 0;
-    
-    
-    for (i = 0; i < dependent_pkgs->len; i++) {
-        int err = ipkg_remove_pkg(conf, dependent_pkgs->pkgs[i],0);
-        if (err)
-            return err;
-    }
-    return 0;
-}
-
-static int user_prefers_removing_dependents(ipkg_conf_t *conf, abstract_pkg_t *abpkg, pkg_t *pkg, abstract_pkg_t **dependents)
-{
-    abstract_pkg_t *dep_ab_pkg;
-    ipkg_message(conf, IPKG_ERROR, "Package %s is depended upon by packages:\n", pkg->name);
-    while ((dep_ab_pkg = *dependents++) != NULL) {
-	 if (dep_ab_pkg->state_status == SS_INSTALLED)
-	      ipkg_message(conf, IPKG_ERROR, "\t%s\n", dep_ab_pkg->name);
-    }
-    ipkg_message(conf, IPKG_ERROR, "These might cease to work if package %s is removed.\n\n", pkg->name);
-    ipkg_message(conf, IPKG_ERROR, "");
-    ipkg_message(conf, IPKG_ERROR, "You can force removal of this package with -force-depends.\n");
-    ipkg_message(conf, IPKG_ERROR, "You can force removal of this package and its dependents\n");
-    ipkg_message(conf, IPKG_ERROR, "with -force-removal-of-dependent-packages or -recursive\n");
-    ipkg_message(conf, IPKG_ERROR, "or by setting option force_removal_of_dependent_packages\n");
-    ipkg_message(conf, IPKG_ERROR, "in ipkg.conf.\n");
-    return 0;
-}
-
-int ipkg_remove_pkg(ipkg_conf_t *conf, pkg_t *pkg,int message)
-{
-/* Actually, when "message == 1" I have been called from an upgrade, and not from a normal remove
-   thus I wan't check for essential, as I'm upgrading.
-   I hope it won't break anything :) 
-*/
-     int err;
-     abstract_pkg_t *parent_pkg = NULL;
-	
-     if (pkg->essential && !message) {
-	  if (conf->force_removal_of_essential_packages) {
-	       fprintf(stderr, "WARNING: Removing essential package %s under your coercion.\n"
-		       "\tIf your system breaks, you get to keep both pieces\n",
-		       pkg->name);
-	  } else {
-	       fprintf(stderr, "ERROR: Refusing to remove essential package %s.\n"
-		       "\tRemoving an essential package may lead to an unusable system, but if\n"
-		       "\tyou enjoy that kind of pain, you can force ipkg to proceed against\n"
-		       "\tits will with the option: -force-removal-of-essential-packages\n",
-		       pkg->name);
-	       return IPKG_PKG_IS_ESSENTIAL;
-	  }
-     }
-
-     if ((parent_pkg = pkg->parent) == NULL)
-	  return 0;
-
-     /* only attempt to remove dependent installed packages if
-      * force_depends is not specified or the package is being
-      * replaced.
-      */
-     if (!conf->force_depends
-	 && !(pkg->state_flag & SF_REPLACE)) {
-	  abstract_pkg_t **dependents;
-	  int has_installed_dependents = 
-	       pkg_has_installed_dependents(conf, parent_pkg, pkg, &dependents);
-
-	  if (has_installed_dependents) {
-	       /*
-		* if this package is depended up by others, then either we should
-		* not remove it or we should remove it and all of its dependents 
-		*/
-
-	       if (!conf->force_removal_of_dependent_packages
-		   && !user_prefers_removing_dependents(conf, parent_pkg, pkg, dependents)) {
-		    return IPKG_PKG_HAS_DEPENDENTS;
-	       }
-
-	       /* remove packages depending on this package - Karthik */
-	       err = ipkg_remove_dependent_pkgs (conf, pkg, dependents);
-	       free(dependents);
-	       if (err) return err;
-	  }
-     }
-
-     if ( message==0 ){
-         printf("Removing package %s from %s...\n", pkg->name, pkg->dest->name);
-         fflush(stdout);
-     }
-     pkg->state_flag |= SF_FILELIST_CHANGED;
-
-     pkg->state_want = SW_DEINSTALL;
-     ipkg_state_changed++;
-
-     pkg_run_script(conf, pkg, "prerm", "remove");
-
-     /* DPKG_INCOMPATIBILITY: dpkg is slightly different here. It
-	maintains an empty filelist rather than deleting it. That seems
-	like a big pain, and I don't see that that should make a big
-	difference, but for anyone who wants tighter compatibility,
-	feel free to fix this. */
-     remove_data_files_and_list(conf, pkg);
-
-     pkg_run_script(conf, pkg, "postrm", "remove");
-
-     remove_maintainer_scripts_except_postrm(conf, pkg);
-
-     /* Aman Gupta - Since ipkg is made for handheld devices with limited
-      * space, it doesn't make sense to leave extra configurations, files, 
-      * and maintainer scripts left around. So, we make remove like purge, 
-      * and take out all the crap :) */
-
-     remove_postrm(conf, pkg);
-     pkg->state_status = SS_NOT_INSTALLED;
-
-     if (parent_pkg) 
-	  parent_pkg->state_status = SS_NOT_INSTALLED;
-
-     return 0;
-}
-
-int ipkg_purge_pkg(ipkg_conf_t *conf, pkg_t *pkg)
-{
-    ipkg_remove_pkg(conf, pkg,0);
-    return 0;
-}
-
-int remove_data_files_and_list(ipkg_conf_t *conf, pkg_t *pkg)
-{
-     str_list_t installed_dirs;
-     str_list_t *installed_files;
-     str_list_elt_t *iter;
-     char *file_name;
-     conffile_t *conffile;
-     int removed_a_dir;
-     pkg_t *owner;
-
-     str_list_init(&installed_dirs);
-     installed_files = pkg_get_installed_files(pkg);
-
-     for (iter = installed_files->head; iter; iter = iter->next) {
-	  file_name = iter->data;
-
-	  if (file_is_dir(file_name)) {
-	       str_list_append(&installed_dirs, strdup(file_name));
-	       continue;
-	  }
-
-	  conffile = pkg_get_conffile(pkg, file_name);
-	  if (conffile) {
-	       /* XXX: QUESTION: Is this right? I figure we only need to
-		  save the conffile if it has been modified. Is that what
-		  dpkg does? Or does dpkg preserve all conffiles? If so,
-		  this seems like a better thing to do to conserve
-		  space. */
-	       if (conffile_has_been_modified(conf, conffile)) {
-		    printf("  not deleting modified conffile %s\n", file_name);
-		    fflush(stdout);
-		    continue;
-	       }
-	  }
-
-	  ipkg_message(conf, IPKG_INFO, "  deleting %s (noaction=%d)\n", file_name, conf->noaction);
-	  if (!conf->noaction)
-	       unlink(file_name);
-     }
-
-     if (!conf->noaction) {
-	  do {
-	       removed_a_dir = 0;
-	       for (iter = installed_dirs.head; iter; iter = iter->next) {
-		    file_name = iter->data;
-	    
-		    if (rmdir(file_name) == 0) {
-			 ipkg_message(conf, IPKG_INFO, "  deleting %s\n", file_name);
-			 removed_a_dir = 1;
-			 str_list_remove(&installed_dirs, &iter);
-		    }
-	       }
-	  } while (removed_a_dir);
-     }
-
-     pkg_free_installed_files(pkg);
-     /* We have to remove the file list now, so that
-	find_pkg_owning_file does not always just report this package */
-     pkg_remove_installed_files_list(conf, pkg);
-
-     /* Don't print warning for dirs that are provided by other packages */
-     for (iter = installed_dirs.head; iter; iter = iter->next) {
-	  file_name = iter->data;
-
-	  owner = file_hash_get_file_owner(conf, file_name);
-	  if (owner) {
-	       free(iter->data);
-	       iter->data = NULL;
-	       str_list_remove(&installed_dirs, &iter);
-	  }
-     }
-
-     /* cleanup */
-     for (iter = installed_dirs.head; iter; iter = iter->next) {
-	  free(iter->data);
-	  iter->data = NULL;
-     }
-     str_list_deinit(&installed_dirs);
-
-     return 0;
-}
-
-int remove_maintainer_scripts_except_postrm(ipkg_conf_t *conf, pkg_t *pkg)
-{
-    int i, err;
-    char *globpattern;
-    glob_t globbuf;
-    
-    if (conf->noaction) return 0;
-
-    sprintf_alloc(&globpattern, "%s/%s.*",
-		  pkg->dest->info_dir, pkg->name);
-    err = glob(globpattern, 0, NULL, &globbuf);
-    free(globpattern);
-    if (err) {
-	return 0;
-    }
-
-    for (i = 0; i < globbuf.gl_pathc; i++) {
-	if (str_ends_with(globbuf.gl_pathv[i], ".postrm")) {
-	    continue;
-	}
-        ipkg_message(conf, IPKG_INFO, "  deleting %s\n", globbuf.gl_pathv[i]);
-	unlink(globbuf.gl_pathv[i]);
-    }
-    globfree(&globbuf);
-
-    return 0;
-}
-
-int remove_postrm(ipkg_conf_t *conf, pkg_t *pkg)
-{
-    char *postrm_file_name;
-
-    if (conf->noaction) return 0;
-
-    sprintf_alloc(&postrm_file_name, "%s/%s.postrm",
-		  pkg->dest->info_dir, pkg->name);
-    unlink(postrm_file_name);
-    free(postrm_file_name);
-
-    return 0;
-}

Deleted: trunk/src/target/opkg/ipkg_remove.h
===================================================================
--- trunk/src/target/ipkg/ipkg_remove.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_remove.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,33 +0,0 @@
-/* ipkg_remove.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 IPKG_REMOVE_H
-#define IPKG_REMOVE_H
-
-#include "pkg.h"
-#include "ipkg_conf.h"
-
-int ipkg_remove_pkg(ipkg_conf_t *conf, pkg_t *pkg,int message);
-int ipkg_purge_pkg(ipkg_conf_t *conf, pkg_t *pkg);
-int possible_broken_removal_of_packages (ipkg_conf_t *conf, pkg_t *pkg);
-int pkg_has_installed_dependents(ipkg_conf_t *conf, abstract_pkg_t *parent_apkg, pkg_t *pkg, abstract_pkg_t *** pdependents);
-int remove_data_files_and_list(ipkg_conf_t *conf, pkg_t *pkg);
-int remove_maintainer_scripts_except_postrm (ipkg_conf_t *conf, pkg_t *pkg);
-int remove_postrm (ipkg_conf_t *conf, pkg_t *pkg);
-
-
-#endif

Deleted: trunk/src/target/opkg/ipkg_upgrade.c
===================================================================
--- trunk/src/target/ipkg/ipkg_upgrade.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_upgrade.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,77 +0,0 @@
-/* ipkg_upgrade.c - the itsy package management system
-
-   Carl D. Worth
-   Copyright (C) 2001 University of Southern California
-
-   Copyright (C) 2003 Daniele Nicolodi <daniele at grinta.net>
-
-   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 "ipkg.h"
-#include "ipkg_install.h"
-#include "ipkg_message.h"
-
-int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old)
-{
-     pkg_t *new;
-     int cmp;
-     char *old_version, *new_version;
-
-     if (old->state_flag & SF_HOLD) {
-          ipkg_message(conf, IPKG_NOTICE,
-                       "Not upgrading package %s which is marked "
-                       "hold (flags=%#x)\n", old->name, old->state_flag);
-          return 0;
-     }
-
-     new = pkg_hash_fetch_best_installation_candidate_by_name(conf, old->name);
-     if (new == NULL) {
-          old_version = pkg_version_str_alloc(old);
-          ipkg_message(conf, IPKG_NOTICE,
-                       "Assuming locally installed package %s (%s) "
-                       "is up to date.\n", old->name, old_version);
-          free(old_version);
-          return 0;
-     }
-          
-     old_version = pkg_version_str_alloc(old);
-     new_version = pkg_version_str_alloc(new);
-               
-     cmp = pkg_compare_versions(old, new);
-     ipkg_message(conf, IPKG_DEBUG,
-                  "comparing visible versions of pkg %s:"
-                  "\n\t%s is installed "
-                  "\n\t%s is available "
-                  "\n\t%d was comparison result\n",
-                  old->name, old_version, new_version, cmp);
-     if (cmp == 0) {
-          ipkg_message(conf, IPKG_INFO,
-                       "Package %s (%s) installed in %s is up to date.\n",
-                       old->name, old_version, old->dest->name);
-          free(old_version);
-          free(new_version);
-          return 0;
-     } else if (cmp > 0) {
-          ipkg_message(conf, IPKG_NOTICE,
-                       "Not downgrading package %s on %s from %s to %s.\n",
-                       old->name, old->dest->name, old_version, new_version);
-          free(old_version);
-          free(new_version);
-          return 0;
-     } else if (cmp < 0) {
-          new->dest = old->dest;
-          old->state_want = SW_DEINSTALL;
-     }
-
-     new->state_flag |= SF_USER;
-     return ipkg_install_pkg(conf, new,1);
-}

Deleted: trunk/src/target/opkg/ipkg_upgrade.h
===================================================================
--- trunk/src/target/ipkg/ipkg_upgrade.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_upgrade.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,18 +0,0 @@
-/* ipkg_upgrade.c - the itsy package management system
-
-   Copyright (C) 2003 Daniele Nicolodi <daniele at grinta.net>
-
-   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 "ipkg.h"
-
-int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);

Deleted: trunk/src/target/opkg/ipkg_utils.c
===================================================================
--- trunk/src/target/ipkg/ipkg_utils.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_utils.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,183 +0,0 @@
-/* ipkg_utils.c - the itsy package management system
-
-   Steven M. Ayer
-   
-   Copyright (C) 2002 Compaq Computer Corporation
-
-   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 "ipkg.h"
-#include <errno.h>
-#include <ctype.h>
-#include <sys/vfs.h>
-
-#include "ipkg_utils.h"
-#include "pkg.h"
-#include "pkg_hash.h"
-
-void print_pkg_status(pkg_t * pkg, FILE * file);
-
-int get_available_blocks(char * filesystem)
-{
-     struct statfs sfs;
-
-     if(statfs(filesystem, &sfs)){
-	  fprintf(stderr, "bad statfs\n");
-	  return 0;
-     }
-     /*    fprintf(stderr, "reported fs type %x\n", sfs.f_type); */
-     return ((sfs.f_bavail * sfs.f_bsize) / 1024);
-}
-
-char **read_raw_pkgs_from_file(const char *file_name)
-{
-     FILE *fp; 
-     char **ret;
-    
-     if(!(fp = fopen(file_name, "r"))){
-	  fprintf(stderr, "can't get %s open for read\n", file_name);
-	  return NULL;
-     }
-
-     ret = read_raw_pkgs_from_stream(fp);
-
-     fclose(fp);
-
-     return ret;
-}
-
-char **read_raw_pkgs_from_stream(FILE *fp)
-{    
-     char **raw = NULL, *buf, *scout;
-     int count = 0;
-     size_t size = 512;
-     
-     buf = malloc (size);
-
-     while (fgets(buf, size, fp)) {
-	  while (strlen (buf) == (size - 1)
-		 && buf[size-2] != '\n') {
-	       size_t o = size - 1;
-	       size *= 2;
-	       buf = realloc (buf, size);
-	       if (fgets (buf + o, size - o, fp) == NULL)
-		    break;
-	  }
-	  
-	  if(!(count % 50))
-	       raw = realloc(raw, (count + 50) * sizeof(char *));
-	
-	  if((scout = strchr(buf, '\n')))
-	       *scout = '\0';
-
-	  raw[count++] = strdup(buf);
-     }
-    
-     raw = realloc(raw, (count + 1) * sizeof(char *));
-     raw[count] = NULL;
-
-     free (buf);
-    
-     return raw;
-}
-
-/* something to remove whitespace, a hash pooper */
-char *trim_alloc(char *line)
-{
-     char *new; 
-     char *dest, *src, *end;
-    
-     new = malloc(strlen(line) + 1);
-     if ( new == NULL ){
-        fprintf(stderr,"%s: Unable to allocate memory\n",__FUNCTION__);
-        return NULL;
-     }
-     dest = new, src = line, end = line + (strlen(line) - 1);
-
-     /* remove it from the front */    
-     while(src && 
-	   isspace(*src) &&
-	   *src)
-	  src++;
-     /* and now from the back */
-     while((end > src) &&
-	   isspace(*end))
-	  end--;
-     end++;
-     *end = '\0';
-     strcpy(new, src);
-     /* this does from the first space
-      *  blasting away any versions stuff in depends
-      while(src && 
-      !isspace(*src) &&
-      *src)
-      *dest++ = *src++;
-      *dest = '\0';
-      */
-    
-     return new;
-}
-
-int line_is_blank(const char *line)
-{
-     const char *s;
-
-     for (s = line; *s; s++) {
-	  if (!isspace(*s))
-	       return 0;
-     }
-     return 1;
-}
-
-void push_error_list(struct errlist ** errors, char * msg){
-  struct errlist *err_lst_tmp;
-
-
-  err_lst_tmp = malloc ( sizeof (err_lst_tmp) );
-  err_lst_tmp->errmsg=strdup(msg) ;
-  err_lst_tmp->next = *errors;
-  *errors = err_lst_tmp;
-}
-
-
-void reverse_error_list(struct errlist **errors){
-   struct errlist *result=NULL;
-   struct errlist *current= *errors;
-   struct errlist *next;
-
-   while ( current != NULL ) {
-      next = current->next;
-      current->next=result;
-      result=current;
-      current=next;
-   }
-   *errors=result;
-
-}
-
-       
-void free_error_list(){
-struct errlist *err_tmp_lst;
-
-  err_tmp_lst = error_list;
-
-    while (err_tmp_lst != NULL) {
-      free(err_tmp_lst->errmsg);
-      err_tmp_lst = error_list->next;
-      free(error_list);
-      error_list = err_tmp_lst;
-    }
-
-
-}
-
-       

Deleted: trunk/src/target/opkg/ipkg_utils.h
===================================================================
--- trunk/src/target/ipkg/ipkg_utils.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/ipkg_utils.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,29 +0,0 @@
-/* ipkg_utils.h - the itsy package management system
-
-   Steven M. Ayer
-   
-   Copyright (C) 2002 Compaq Computer Corporation
-
-   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 IPKG_UTILS_H
-#define IPKG_UTILS_H
-
-#include "pkg.h"
-
-int get_available_blocks(char * filesystem);
-char **read_raw_pkgs_from_file(const char *file_name);
-char **read_raw_pkgs_from_stream(FILE *fp);
-char *trim_alloc(char * line);
-int line_is_blank(const char *line);
-
-#endif

Deleted: trunk/src/target/opkg/libbb/libbb.h
===================================================================
--- trunk/src/target/ipkg/libbb/libbb.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/libbb/libbb.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,352 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Busybox main internal header file
- *
- * 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 of the License, 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef	__LIBBB_H__
-#define	__LIBBB_H__    1
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <netdb.h>
-
-// Include because of single use with ipkg
-#define _BB_INTERNAL_H_
-#define L_archive_offset
-#define L_get_header_ar
-#define L_free_header_tar
-#define L_get_header_tar
-#define L_unarchive
-#define L_seek_sub_file
-#define L_memory_exhausted
-#define L_deb_extract
-#define L_extract_archive
-#define L_parse_mode
-#define L_time_string
-#define L_mode_string
-
-#ifndef _BB_INTERNAL_H_
-#include "../busybox.h"
-#endif
-
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
-#include <features.h>
-
-#if (__GNU_LIBRARY__ < 5) && (!defined __dietlibc__)
-/* libc5 doesn't define socklen_t */
-typedef unsigned int socklen_t;
-/* libc5 doesn't implement BSD 4.4 daemon() */
-extern int daemon (int nochdir, int noclose);
-/* libc5 doesn't implement strtok_r */
-char *strtok_r(char *s, const char *delim, char **ptrptr);
-#endif	
-
-/* Some useful definitions */
-#define FALSE   ((int) 0)
-#define TRUE    ((int) 1)
-#define SKIP	((int) 2)
-
-/* for mtab.c */
-#define MTAB_GETMOUNTPT '1'
-#define MTAB_GETDEVICE  '2'
-
-#define BUF_SIZE        8192
-#define EXPAND_ALLOC    1024
-
-static inline int is_decimal(int ch) { return ((ch >= '0') && (ch <= '9')); }
-static inline int is_octal(int ch)   { return ((ch >= '0') && (ch <= '7')); }
-
-/* Macros for min/max.  */
-#ifndef MIN
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-
-#ifndef MAX
-#define	MAX(a,b) (((a)>(b))?(a):(b))
-#endif
-
-
-
-extern void show_usage(void) __attribute__ ((noreturn));
-extern void error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
-extern void error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
-extern void perror_msg(const char *s, ...);
-extern void perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn));
-extern void vherror_msg(const char *s, va_list p);
-extern void herror_msg(const char *s, ...);
-extern void herror_msg_and_die(const char *s, ...) __attribute__ ((noreturn));
-extern void archive_xread_all(int fd, char *buf, size_t count);
-
-/* These two are used internally -- you shouldn't need to use them */
-extern void verror_msg(const char *s, va_list p);
-extern void vperror_msg(const char *s, va_list p);
-
-const char *mode_string(int mode);
-const char *time_string(time_t timeVal);
-int is_directory(const char *name, int followLinks, struct stat *statBuf);
-int isDevice(const char *name);
-
-int remove_file(const char *path, int flags);
-int copy_file(const char *source, const char *dest, int flags);
-int copy_file_chunk(FILE *src_file, FILE *dst_file, unsigned long long chunksize);
-char *buildName(const char *dirName, const char *fileName);
-int makeString(int argc, const char **argv, char *buf, int bufLen);
-char *getChunk(int size);
-char *chunkstrdup(const char *str);
-void freeChunks(void);
-ssize_t safe_read(int fd, void *buf, size_t count);
-ssize_t full_write(int fd, const char *buf, int len);
-ssize_t full_read(int fd, char *buf, int len);
-int recursive_action(const char *fileName, int recurse, int followLinks, int depthFirst,
-	  int (*fileAction) (const char *fileName, struct stat* statbuf, void* userData),
-	  int (*dirAction) (const char *fileName, struct stat* statbuf, void* userData),
-	  void* userData);
-
-extern int parse_mode( const char* s, mode_t* theMode);
-
-extern int get_kernel_revision(void);
-
-extern int get_console_fd(char* tty_name);
-extern struct mntent *find_mount_point(const char *name, const char *table);
-extern void write_mtab(char* blockDevice, char* directory, 
-	char* filesystemType, long flags, char* string_flags);
-extern void erase_mtab(const char * name);
-extern long atoi_w_units (const char *cp);
-extern long* find_pid_by_name( char* pidName);
-extern char *find_real_root_device_name(const char* name);
-extern char *get_line_from_file(FILE *file);
-extern void print_file(FILE *file);
-extern int copyfd(int fd1, int fd2);
-extern int print_file_by_name(char *filename);
-extern char process_escape_sequence(const char **ptr);
-extern char *get_last_path_component(char *path);
-extern FILE *wfopen(const char *path, const char *mode);
-extern FILE *xfopen(const char *path, const char *mode);
-extern void chomp(char *s);
-extern struct BB_applet *find_applet_by_name(const char *name);
-void run_applet_by_name(const char *name, int argc, char **argv);
-
-#ifndef DMALLOC
-extern void *xmalloc (size_t size);
-extern void *xrealloc(void *old, size_t size);
-extern void *xcalloc(size_t nmemb, size_t size);
-extern char *xstrdup (const char *s);
-#endif
-extern char *xstrndup (const char *s, int n);
-extern char * safe_strncpy(char *dst, const char *src, size_t size);
-
-struct suffix_mult {
-	const char *suffix;
-	int mult;
-};
-
-extern unsigned long parse_number(const char *numstr,
-		const struct suffix_mult *suffixes);
-
-
-/* These parse entries in /etc/passwd and /etc/group.  This is desirable
- * for BusyBox since we want to avoid using the glibc NSS stuff, which
- * increases target size and is often not needed embedded systems.  */
-extern long my_getpwnam(const char *name);
-extern long my_getgrnam(const char *name);
-extern void my_getpwuid(char *name, long uid);
-extern void my_getgrgid(char *group, long gid);
-extern long my_getpwnamegid(const char *name);
-
-extern int device_open(char *device, int mode);
-
-extern int del_loop(const char *device);
-extern int set_loop(const char *device, const char *file, int offset, int *loopro);
-extern char *find_unused_loop_device (void);
-
-
-#if (__GLIBC__ < 2)
-extern int vdprintf(int d, const char *format, va_list ap);
-#endif
-
-int nfsmount(const char *spec, const char *node, int *flags,
-	     char **extra_opts, char **mount_opts, int running_bg);
-
-void syslog_msg_with_name(const char *name, int facility, int pri, const char *msg);
-void syslog_msg(int facility, int pri, const char *msg);
-
-/* Include our own copy of struct sysinfo to avoid binary compatability
- * problems with Linux 2.4, which changed things.  Grumble, grumble. */
-struct sysinfo {
-	long uptime;			/* Seconds since boot */
-	unsigned long loads[3];		/* 1, 5, and 15 minute load averages */
-	unsigned long totalram;		/* Total usable main memory size */
-	unsigned long freeram;		/* Available memory size */
-	unsigned long sharedram;	/* Amount of shared memory */
-	unsigned long bufferram;	/* Memory used by buffers */
-	unsigned long totalswap;	/* Total swap space size */
-	unsigned long freeswap;		/* swap space still available */
-	unsigned short procs;		/* Number of current processes */
-	unsigned short pad;			/* Padding needed for m68k */
-	unsigned long totalhigh;	/* Total high memory size */
-	unsigned long freehigh;		/* Available high memory size */
-	unsigned int mem_unit;		/* Memory unit size in bytes */
-	char _f[20-2*sizeof(long)-sizeof(int)];	/* Padding: libc5 uses this.. */
-};
-extern int sysinfo (struct sysinfo* info);
-
-enum {
-	KILOBYTE = 1024,
-	MEGABYTE = (KILOBYTE*1024),
-	GIGABYTE = (MEGABYTE*1024)
-};
-const char *make_human_readable_str(unsigned long size, unsigned long block_size, unsigned long display_unit);
-
-int ask_confirmation(void);
-int klogctl(int type, char * b, int len);
-
-char *xgetcwd(char *cwd);
-char *xreadlink(const char *path);
-char *concat_path_file(const char *path, const char *filename);
-char *last_char_is(const char *s, int c);
-
-extern long arith (const char *startbuf, int *errcode);
-
-typedef struct file_headers_s {
-	char *name;
-	char *link_name;
-	off_t size;
-	uid_t uid;
-	gid_t gid;
-	mode_t mode;
-	time_t mtime;
-	dev_t device;
-} file_header_t;
-file_header_t *get_header_ar(FILE *in_file);
-void free_header_ar(file_header_t *ar_entry);
-file_header_t *get_header_cpio(FILE *src_stream);
-file_header_t *get_header_tar(FILE *tar_stream);
-void free_header_tar(file_header_t *tar_entry);
-
-enum extract_functions_e {
-	extract_verbose_list = 1,
-	extract_list = 2,
-	extract_one_to_buffer = 4,
-	extract_to_stdout = 8,
-	extract_all_to_fs = 16,
-	extract_preserve_date = 32,
-	extract_data_tar_gz = 64,
-	extract_control_tar_gz = 128,
-	extract_unzip_only = 256,
-	extract_unconditional = 512,
-	extract_create_leading_dirs = 1024,
-	extract_quiet = 2048,
-	extract_exclude_list = 4096
-};
-char *unarchive(FILE *src_stream, FILE *out_stream,
-		file_header_t *(*get_header)(FILE *),
-		void (*free_headers)(file_header_t *),
-		const int extract_function, const char *prefix, char **extract_names);
-char *deb_extract(const char *package_filename, FILE *out_stream, const int extract_function,
-	const char *prefix, const char *filename);
-int read_package_field(const char *package_buffer, char **field_name, char **field_value);
-char *fgets_str(FILE *file, const char *terminating_string);
-
-extern int unzip(FILE *l_in_file, FILE *l_out_file);
-extern void gz_close(int gunzip_pid);
-extern FILE *gz_open(FILE *compressed_file, int *pid);
-
-extern struct hostent *xgethostbyname(const char *name);
-extern int create_icmp_socket(void);
-
-char *dirname (char *path);
-
-int make_directory (const char *path, long mode, int flags);
-
-const char *u_signal_names(const char *str_sig, int *signo, int startnum);
-char *simplify_path(const char *path);
-
-#define CT_AUTO	0
-#define CT_UNIX2DOS	1
-#define CT_DOS2UNIX	2
-/* extern int convert(char *fn, int ConvType); */
-
-enum {
-	FILEUTILS_PRESERVE_STATUS = 1,
-	FILEUTILS_PRESERVE_SYMLINKS = 2,
-	FILEUTILS_RECUR = 4,
-	FILEUTILS_FORCE = 8,
-	FILEUTILS_INTERACTIVE = 16
-};
-
-extern const char *applet_name;
-extern const char * const full_version;
-extern const char * const name_too_long;
-extern const char * const omitting_directory;
-extern const char * const not_a_directory;
-extern const char * const memory_exhausted;
-extern const char * const invalid_date;
-extern const char * const invalid_option;
-extern const char * const io_error;
-extern const char * const dash_dash_help;
-extern const char * const write_error;
-extern const char * const too_few_args;
-extern const char * const name_longer_than_foo;
-extern const char * const unknown;
-extern const char * const can_not_create_raw_socket;
-
-#ifdef BB_FEATURE_DEVFS
-# define CURRENT_VC "/dev/vc/0"
-# define VC_1 "/dev/vc/1"
-# define VC_2 "/dev/vc/2"
-# define VC_3 "/dev/vc/3"
-# define VC_4 "/dev/vc/4"
-# define VC_5 "/dev/vc/5"
-# define SC_0 "/dev/tts/0"
-# define SC_1 "/dev/tts/1"
-# define VC_FORMAT "/dev/vc/%d"
-# define SC_FORMAT "/dev/tts/%d"
-# define LOOP_FORMAT "/dev/loop/%d"
-#else
-# define CURRENT_VC "/dev/tty0"
-# define VC_1 "/dev/tty1"
-# define VC_2 "/dev/tty2"
-# define VC_3 "/dev/tty3"
-# define VC_4 "/dev/tty4"
-# define VC_5 "/dev/tty5"
-# define SC_0 "/dev/ttyS0"
-# define SC_1 "/dev/ttyS1"
-# define VC_FORMAT "/dev/tty%d"
-# define SC_FORMAT "/dev/ttyS%d"
-# define LOOP_FORMAT "/dev/loop%d"
-#endif
-
-/* The following devices are the same on devfs and non-devfs systems.  */
-#define CURRENT_TTY "/dev/tty"
-#define CONSOLE_DEV "/dev/console"
-
-/* Cope with mmu-less systems somewhat gracefully */
-#if defined(__UCLIBC__) && !defined(__ARCH_HAS_MMU__)
-#define fork	vfork
-#endif
-
-/* Stupid gcc always includes its own builtin strlen()... */
-extern size_t xstrlen(const char *string);
-#define strlen(x)	xstrlen(x)
-
-#endif /* __LIBBB_H__ */

Copied: trunk/src/target/opkg/libbb/libbb.h (from rev 3879, trunk/src/target/ipkg/libbb/libbb.h)

Deleted: trunk/src/target/opkg/libbb/unarchive.c
===================================================================
--- trunk/src/target/ipkg/libbb/unarchive.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/libbb/unarchive.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,811 +0,0 @@
-/*
- *  Copyright (C) 2000 by Glenn McGrath
- *  Copyright (C) 2001 by Laurence Anderson
- *	
- *  Based on previous work by busybox developers and others.
- *
- *  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 of the License, 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 Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <utime.h>
-#include "libbb.h"
-
-#define CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY 1
-#define CONFIG_FEATURE_TAR_GNU_EXTENSIONS
-
-#ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS
-static char *longname = NULL;
-static char *linkname = NULL;
-#endif
-
-extern void seek_sub_file(FILE *src_stream, const int count);
-extern char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *file_entry,
-                              const int function, const char *prefix);
-
-
-#ifdef L_archive_offset
-off_t archive_offset;
-#else
-extern off_t archive_offset;
-#endif	
-
-#ifdef L_seek_sub_file
-void seek_sub_file(FILE *src_stream, const int count)
-{
-	int i;
-	/* Try to fseek as faster */
-	archive_offset += count;
-	if (fseek(src_stream, count, SEEK_CUR) != 0 && errno == ESPIPE) {
-	for (i = 0; i < count; i++) {
-		fgetc(src_stream);
-		}
-	}
-	return;
-}
-#endif	
-
-
-
-#ifdef L_extract_archive
-/* Extract the data postioned at src_stream to either filesystem, stdout or 
- * buffer depending on the value of 'function' which is defined in libbb.h 
- *
- * prefix doesnt have to be just a directory, it may prefix the filename as well.
- *
- * e.g. '/var/lib/dpkg/info/dpkg.' will extract all files to the base bath 
- * '/var/lib/dpkg/info/' and all files/dirs created in that dir will have 
- * 'dpkg.' as their prefix
- *
- * For this reason if prefix does point to a dir then it must end with a
- * trailing '/' or else the last dir will be assumed to be the file prefix 
- */
-char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *file_entry,
- const int function, const char *prefix)
-{
-	FILE *dst_stream = NULL;
-	char *full_name = NULL;
-	char *full_link_name = NULL;
-	char *buffer = NULL;
-	struct utimbuf t;
-        int res;
-
-
-	/* prefix doesnt have to be a proper path it may prepend 
-	 * the filename as well */
-	if (prefix != NULL) {
-		/* strip leading '/' in filename to extract as prefix may not be dir */
-		/* Cant use concat_path_file here as prefix might not be a directory */
-		char *path = file_entry->name;
-		if (strncmp("./", path, 2) == 0) {
-			path += 2;
-			if (strlen(path) == 0) {
-				return(NULL);
-			}
-		}
-		full_name = xmalloc(strlen(prefix) + strlen(path) + 1);
-		strcpy(full_name, prefix);
-		strcat(full_name, path);
-                if ( file_entry->link_name ){
-		   full_link_name = xmalloc(strlen(prefix) + strlen(file_entry->link_name) + 1);
-		   strcpy(full_link_name, prefix);
-		   strcat(full_link_name, file_entry->link_name);
-                }
-	} else {
-		full_name = strdup(file_entry->name);
-                if ( file_entry->link_name )
-		   full_link_name = strdup(file_entry->link_name);
-	}
-
-
-	if (function & extract_to_stdout) {
-		if (S_ISREG(file_entry->mode)) {
-			copy_file_chunk(src_stream, out_stream, file_entry->size);			
-			archive_offset += file_entry->size;
-		}
-	}
-	else if (function & extract_one_to_buffer) { 
-		if (S_ISREG(file_entry->mode)) {
-			buffer = (char *) xmalloc(file_entry->size + 1);
-			fread(buffer, 1, file_entry->size, src_stream);
-			buffer[file_entry->size] = '\0';
-			archive_offset += file_entry->size;
-			return(buffer);
-		}
-	}
-	else if (function & extract_all_to_fs) {
-		struct stat oldfile;
-		int stat_res;
-		stat_res = lstat (full_name, &oldfile);
-		if (stat_res == 0) { /* The file already exists */
-			if ((function & extract_unconditional) || (oldfile.st_mtime < file_entry->mtime)) {
-				if (!S_ISDIR(oldfile.st_mode)) {
-					unlink(full_name); /* Directories might not be empty etc */
-				}
-			} else {
-				if ((function & extract_quiet) != extract_quiet) {
-					error_msg("%s not created: newer or same age file exists", file_entry->name);
-				}
-				seek_sub_file(src_stream, file_entry->size);
-				return (NULL);
-			}
-		}
-		if (function & extract_create_leading_dirs) { /* Create leading directories with default umask */
-			char *buf, *parent;
-			buf = xstrdup(full_name);
-			parent = dirname(buf);
-			if (make_directory (parent, -1, FILEUTILS_RECUR) != 0) {
-				if ((function & extract_quiet) != extract_quiet) {
-					error_msg("couldn't create leading directories");
-				}
-			}
-			free (buf);
-		}
-		switch(file_entry->mode & S_IFMT) {
-			case S_IFREG:
-				if (file_entry->link_name) { /* Found a cpio hard link */
-					if (link(full_link_name, full_name) != 0) {
-						if ((function & extract_quiet) != extract_quiet) {
-							perror_msg("Cannot link from %s to '%s'",
-								file_entry->name, file_entry->link_name);
-						}
-					}
-				} else {
-					if ((dst_stream = wfopen(full_name, "w")) == NULL) {
-						seek_sub_file(src_stream, file_entry->size);
-						return NULL;
-					}
-					archive_offset += file_entry->size;
-					copy_file_chunk(src_stream, dst_stream, file_entry->size);			
-					fclose(dst_stream);
-				}
-				break;
-			case S_IFDIR:
-				if (stat_res != 0) {
-					if (mkdir(full_name, file_entry->mode) < 0) {
-						if ((function & extract_quiet) != extract_quiet) {
-							perror_msg("extract_archive: %s", full_name);
-						}
-					}
-				}
-				break;
-			case S_IFLNK:
-				if (symlink(file_entry->link_name, full_name) < 0) {
-					if ((function & extract_quiet) != extract_quiet) {
-						perror_msg("Cannot create symlink from %s to '%s'", file_entry->name, file_entry->link_name);
-					}
-					return NULL;
-				}
-				break;
-			case S_IFSOCK:
-			case S_IFBLK:
-			case S_IFCHR:
-			case S_IFIFO:
-				if (mknod(full_name, file_entry->mode, file_entry->device) == -1) {
-					if ((function & extract_quiet) != extract_quiet) {
-						perror_msg("Cannot create node %s", file_entry->name);
-					}
-					return NULL;
-				}
-				break;
-                         default:
-                            perror_msg("Don't know how to handle %s", full_name);
-
-		}
-
-		/* Changing a symlink's properties normally changes the properties of the 
-		 * file pointed to, so dont try and change the date or mode, lchown does
-		 * does the right thing, but isnt available in older versions of libc */
-		if (S_ISLNK(file_entry->mode)) {
-#if (__GLIBC__ > 2) && (__GLIBC_MINOR__ > 1)
-			lchown(full_name, file_entry->uid, file_entry->gid);
-#endif
-		} else {
-			if (function & extract_preserve_date) {
-				t.actime = file_entry->mtime;
-				t.modtime = file_entry->mtime;
-				utime(full_name, &t);
-			}
-			chown(full_name, file_entry->uid, file_entry->gid);
-			chmod(full_name, file_entry->mode);
-		}
-	} else {
-		/* If we arent extracting data we have to skip it, 
-		 * if data size is 0 then then just do it anyway
-		 * (saves testing for it) */
-		seek_sub_file(src_stream, file_entry->size);
-	}
-
-	/* extract_list and extract_verbose_list can be used in conjunction
-	 * with one of the above four extraction functions, so do this seperately */
-	if (function & extract_verbose_list) {
-		fprintf(out_stream, "%s %d/%d %8d %s ", mode_string(file_entry->mode), 
-			file_entry->uid, file_entry->gid,
-			(int) file_entry->size, time_string(file_entry->mtime));
-	}
-	if ((function & extract_list) || (function & extract_verbose_list)){
-		/* fputs doesnt add a trailing \n, so use fprintf */
-		fprintf(out_stream, "%s\n", file_entry->name);
-	}
-
-	free(full_name);
-        if ( full_link_name )
-	    free(full_link_name);
-
-	return(NULL); /* Maybe we should say if failed */
-}
-#endif
-
-#ifdef L_unarchive
-char *unarchive(FILE *src_stream, FILE *out_stream,
-		file_header_t *(*get_headers)(FILE *),
-		void (*free_headers)(file_header_t *),
-		const int extract_function, const char *prefix, char **extract_names)
-{
-	file_header_t *file_entry;
-	int extract_flag;
-	int i;
-	char *buffer = NULL;
-
-	archive_offset = 0;
-	while ((file_entry = get_headers(src_stream)) != NULL) {
-		extract_flag = TRUE;
-		/* fprintf(stderr, __FUNCTION__ " getting headers\n"); */
-		if (extract_names != NULL) {
-			int found_flag = FALSE;
-			for(i = 0; extract_names[i] != 0; i++) {
-				if (strcmp(extract_names[i], file_entry->name) == 0) {
-					found_flag = TRUE;
-					break;
-				}
-			}
-			if (extract_function & extract_exclude_list) {
-				if (found_flag == TRUE) {
-					extract_flag = FALSE;
-				}
-			} else {
-				/* If its not found in the include list dont extract it */
-				if (found_flag == FALSE) {
-					extract_flag = FALSE;
-				}
-			}
-
-		}
-
-		if (extract_flag == TRUE) {
-			/* fprintf(stderr, __FUNCTION__ " extract?\n"); */
-			buffer = extract_archive(src_stream, out_stream, file_entry, extract_function, prefix);
-			/* fprintf(stderr, __FUNCTION__ " extracted\n"); */
-		} else {
-			/* seek past the data entry */
-			seek_sub_file(src_stream, file_entry->size);
-		}
-		free_headers(file_entry);
-	}
-	/*fprintf(stderr, __FUNCTION__ " goin home\n");*/
-	
-	return(buffer);
-}
-#endif
-
-#ifdef L_get_header_ar
-file_header_t *get_header_ar(FILE *src_stream)
-{
-	file_header_t *typed;
-	union {
-		char raw[60];
-	 	struct {
- 			char name[16];
- 			char date[12];
- 			char uid[6];
- 			char gid[6];
- 			char mode[8];
- 			char size[10];
- 			char magic[2];
- 		} formated;
-	} ar;
-	static char *ar_long_names;
-
-	if (fread(ar.raw, 1, 60, src_stream) != 60) {
-		return(NULL);
-	}
-	archive_offset += 60;
-	/* align the headers based on the header magic */
-	if ((ar.formated.magic[0] != '`') || (ar.formated.magic[1] != '\n')) {
-		/* some version of ar, have an extra '\n' after each data entry,
-		 * this puts the next header out by 1 */
-		if (ar.formated.magic[1] != '`') {
-			error_msg("Invalid magic");
-			return(NULL);
-		}
-		/* read the next char out of what would be the data section,
-		 * if its a '\n' then it is a valid header offset by 1*/
-		archive_offset++;
-		if (fgetc(src_stream) != '\n') {
-			error_msg("Invalid magic");
-			return(NULL);
-		}
-		/* fix up the header, we started reading 1 byte too early */
-		/* raw_header[60] wont be '\n' as it should, but it doesnt matter */
-		memmove(ar.raw, &ar.raw[1], 59);
-	}
-		
-	typed = (file_header_t *) xcalloc(1, sizeof(file_header_t));
-
-	typed->size = (size_t) atoi(ar.formated.size);
-	/* long filenames have '/' as the first character */
-	if (ar.formated.name[0] == '/') {
-		if (ar.formated.name[1] == '/') {
-			/* If the second char is a '/' then this entries data section
-			 * stores long filename for multiple entries, they are stored
-			 * in static variable long_names for use in future entries */
-			ar_long_names = (char *) xrealloc(ar_long_names, typed->size);
-			fread(ar_long_names, 1, typed->size, src_stream);
-			archive_offset += typed->size;
-			/* This ar entries data section only contained filenames for other records
-			 * they are stored in the static ar_long_names for future reference */
-			return (get_header_ar(src_stream)); /* Return next header */
-		} else if (ar.formated.name[1] == ' ') {
-			/* This is the index of symbols in the file for compilers */
-			seek_sub_file(src_stream, typed->size);
-			return (get_header_ar(src_stream)); /* Return next header */
-		} else {
-			/* The number after the '/' indicates the offset in the ar data section
-			(saved in variable long_name) that conatains the real filename */
-			if (!ar_long_names) {
-				error_msg("Cannot resolve long file name");
-				return (NULL);
-			}
-			typed->name = xstrdup(ar_long_names + atoi(&ar.formated.name[1]));
-		}
-	} else {
-		/* short filenames */
-		typed->name = xcalloc(1, 16);
-		strncpy(typed->name, ar.formated.name, 16);
-	}
-	typed->name[strcspn(typed->name, " /")]='\0';
-
-	/* convert the rest of the now valid char header to its typed struct */	
-	parse_mode(ar.formated.mode, &typed->mode);
-	typed->mtime = atoi(ar.formated.date);
-	typed->uid = atoi(ar.formated.uid);
-	typed->gid = atoi(ar.formated.gid);
-
-	return(typed);
-}
-
-void free_header_ar(file_header_t *ar_entry)
-{
-    if (ar_entry == NULL) {
-	return;
-    }
-
-    free(ar_entry->name);
-    free(ar_entry->link_name);
-
-    free(ar_entry);
-}
-#endif
-
-#ifdef L_get_header_cpio
-struct hardlinks {
-	file_header_t *entry;
-	int inode;
-	struct hardlinks *next;
-};
-
-file_header_t *get_header_cpio(FILE *src_stream)
-{
-	file_header_t *cpio_entry = NULL;
-	char cpio_header[110];
-	int namesize;
- 	char dummy[16];
- 	int major, minor, nlink, inode;
- 	static struct hardlinks *saved_hardlinks = NULL;
- 	static int pending_hardlinks = 0;
-
-
-	if (pending_hardlinks) { /* Deal with any pending hardlinks */
-		struct hardlinks *tmp = saved_hardlinks, *oldtmp = NULL;
-		while (tmp) {
-			if (tmp->entry->link_name) { /* Found a hardlink ready to be extracted */
-				cpio_entry = tmp->entry;
-				if (oldtmp) oldtmp->next = tmp->next; /* Remove item from linked list */
-				else saved_hardlinks = tmp->next;
-				free(tmp);
-				return (cpio_entry);
-			}
-			oldtmp = tmp;
-			tmp = tmp->next;
-		}
-		pending_hardlinks = 0; /* No more pending hardlinks, read next file entry */
-	}
-  
-	/* There can be padding before archive header */
-	seek_sub_file(src_stream, (4 - (archive_offset % 4)) % 4);
-	if (fread(cpio_header, 1, 110, src_stream) == 110) {
-		archive_offset += 110;
-		if (strncmp(cpio_header, "07070", 5) != 0) {
-			error_msg("Unsupported format or invalid magic");
-			return(NULL);
-		}
-		switch (cpio_header[5]) {
-			case '2': /* "crc" header format */
-				/* Doesnt do the crc check yet */
-			case '1': /* "newc" header format */
-				cpio_entry = (file_header_t *) xcalloc(1, sizeof(file_header_t));
-				sscanf(cpio_header, "%6c%8x%8x%8x%8x%8x%8lx%8lx%16c%8x%8x%8x%8c",
-					dummy, &inode, (unsigned int*)&cpio_entry->mode, 
-					(unsigned int*)&cpio_entry->uid, (unsigned int*)&cpio_entry->gid,
-					&nlink, &cpio_entry->mtime, (unsigned long*)&cpio_entry->size,
-					dummy, &major, &minor, &namesize, dummy);
-
-				cpio_entry->name = (char *) xcalloc(1, namesize);
-				fread(cpio_entry->name, 1, namesize, src_stream); /* Read in filename */
-				archive_offset += namesize;
-				/* Skip padding before file contents */
-				seek_sub_file(src_stream, (4 - (archive_offset % 4)) % 4);
-				if (strcmp(cpio_entry->name, "TRAILER!!!") == 0) {
-					printf("%d blocks\n", (int) (archive_offset % 512 ? (archive_offset / 512) + 1 : archive_offset / 512)); /* Always round up */
-					if (saved_hardlinks) { /* Bummer - we still have unresolved hardlinks */
-						struct hardlinks *tmp = saved_hardlinks, *oldtmp = NULL;
-						while (tmp) {
-							error_msg("%s not created: cannot resolve hardlink", tmp->entry->name);
-							oldtmp = tmp;
-							tmp = tmp->next;
-							free (oldtmp->entry->name);
-							free (oldtmp->entry);
-							free (oldtmp);
-						}
-						saved_hardlinks = NULL;
-						pending_hardlinks = 0;
-					}
-					return(NULL);
-				}
-
-				if (S_ISLNK(cpio_entry->mode)) {
-					cpio_entry->link_name = (char *) xcalloc(1, cpio_entry->size + 1);
-					fread(cpio_entry->link_name, 1, cpio_entry->size, src_stream);
-					archive_offset += cpio_entry->size;
-					cpio_entry->size = 0; /* Stop possiable seeks in future */
-				}
-				if (nlink > 1 && !S_ISDIR(cpio_entry->mode)) {
-					if (cpio_entry->size == 0) { /* Put file on a linked list for later */
-						struct hardlinks *new = xmalloc(sizeof(struct hardlinks));
-						new->next = saved_hardlinks;
-						new->inode = inode;
-						new->entry = cpio_entry;
-						saved_hardlinks = new;
-					return(get_header_cpio(src_stream)); /* Recurse to next file */
-					} else { /* Found the file with data in */
-						struct hardlinks *tmp = saved_hardlinks;
-						pending_hardlinks = 1;
-						while (tmp) {
-							if (tmp->inode == inode) {
-								tmp->entry->link_name = xstrdup(cpio_entry->name);
-								nlink--;
-							}
-							tmp = tmp->next;
-						}
-						if (nlink > 1) error_msg("error resolving hardlink: did you create the archive with GNU cpio 2.0-2.2?");
-					}
-				}
-				cpio_entry->device = (major << 8) | minor;
-				break;
-			default:
-				error_msg("Unsupported format");
-				return(NULL);
-		}
-		if (ferror(src_stream) || feof(src_stream)) {
-			perror_msg("Stream error");
-			return(NULL);
-		}
-	}
-	return(cpio_entry);
-}
-#endif
-
-#ifdef L_get_header_tar
-file_header_t *get_header_tar(FILE *tar_stream)
-{
-
-	union {
-		unsigned char raw[512];
-		struct {
-			char name[100];		/*   0-99 */
-			char mode[8];		/* 100-107 */
-			char uid[8];		/* 108-115 */
-			char gid[8];		/* 116-123 */
-			char size[12];		/* 124-135 */
-			char mtime[12];		/* 136-147 */
-			char chksum[8];		/* 148-155 */
-			char typeflag;		/* 156-156 */
-			char linkname[100];	/* 157-256 */
-			char magic[6];		/* 257-262 */
-			char version[2];	/* 263-264 */
-			char uname[32];		/* 265-296 */
-			char gname[32];		/* 297-328 */
-			char devmajor[8];	/* 329-336 */
-			char devminor[8];	/* 337-344 */
-			char prefix[155];	/* 345-499 */
-			char padding[12];	/* 500-512 */
-		} formated;
-	} tar;
-	file_header_t *tar_entry = NULL;
-	long i;
-	long sum = 0;
-
-	if (archive_offset % 512 != 0) {
-		seek_sub_file(tar_stream, 512 - (archive_offset % 512));
-	}
-
-	if (fread(tar.raw, 1, 512, tar_stream) != 512) {
-		/* Unfortunatly its common for tar files to have all sorts of
-		 * trailing garbage, fail silently */
-//		error_msg("Couldnt read header");
-		return(NULL);
-	}
-	archive_offset += 512;
-
-	/* Check header has valid magic, unfortunately some tar files
-	 * have empty (0'ed) tar entries at the end, which will
-	 * cause this to fail, so fail silently for now
-	 */
-	if (strncmp(tar.formated.magic, "ustar", 5) != 0) {
-#ifdef CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY
-		if (strncmp(tar.formated.magic, "\0\0\0\0\0", 5) != 0)
-#endif
-		return(NULL);
-	}
-
-	/* Do checksum on headers */
-	for (i =  0; i < 148 ; i++) {
-		sum += tar.raw[i];
-	}
-	sum += ' ' * 8;
-	for (i =  156; i < 512 ; i++) {
-		sum += tar.raw[i];
-	}
-	if (sum != strtol(tar.formated.chksum, NULL, 8)) {
-		if ( strtol(tar.formated.chksum,NULL,8) != 0 )
-			error_msg("Invalid tar header checksum");
-                return(NULL);
-        }
-
-	/* convert to type'ed variables */
-	tar_entry = xcalloc(1, sizeof(file_header_t));
-
-#ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS
-        if (longname) {
-                tar_entry->name = longname;
-                longname = NULL;
-        }
-        else if (linkname) {
-                tar_entry->name = linkname;
-                linkname = NULL;
-        } else
-#endif
-        if (tar.formated.prefix[0] == 0) {
-                tar_entry->name = strdup(tar.formated.name);
-        } else {                                              
-                tar_entry->name = concat_path_file(tar.formated.prefix, tar.formated.name);
-        }
-
-	// tar_entry->name = xstrdup(tar.formated.name);
-
-/*
-	parse_mode(tar.formated.mode, &tar_entry->mode);
-*/
-        tar_entry->mode = 07777 & strtol(tar.formated.mode, NULL, 8);
-
-	tar_entry->uid   = strtol(tar.formated.uid, NULL, 8);
-	tar_entry->gid   = strtol(tar.formated.gid, NULL, 8);
-	tar_entry->size  = strtol(tar.formated.size, NULL, 8);
-	tar_entry->mtime = strtol(tar.formated.mtime, NULL, 8);
-	tar_entry->link_name  = strlen(tar.formated.linkname) ? 
-	    xstrdup(tar.formated.linkname) : NULL;
-	tar_entry->device = (strtol(tar.formated.devmajor, NULL, 8) << 8) +
-		strtol(tar.formated.devminor, NULL, 8);
-
-	/* Fix mode, used by the old format */
-	switch (tar.formated.typeflag) {
-	/* hard links are detected as regular files with 0 size and a link name */
-	case '1':
-		tar_entry->mode |= S_IFREG ;
-		break;
-        case 0:
-        case '0':
-
-# ifdef CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY
-		if (last_char_is(tar_entry->name, '/')) {
-			tar_entry->mode |= S_IFDIR;
-		} else 
-# endif
-			tar_entry->mode |= S_IFREG;
-		break;
-	case '2':
-		tar_entry->mode |= S_IFLNK;
-		break;
-	case '3':
-		tar_entry->mode |= S_IFCHR;
-		break;
-	case '4':
-		tar_entry->mode |= S_IFBLK;
-		break;
-	case '5':
-		tar_entry->mode |= S_IFDIR;
-		break;
-	case '6':
-		tar_entry->mode |= S_IFIFO;
-		break;
-# ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS
-	case 'L': {
-			longname = xmalloc(tar_entry->size + 1);
-                        if(fread(longname, tar_entry->size, 1, tar_stream) != 1)
-                                return NULL;
-			longname[tar_entry->size] = '\0';
-			archive_offset += tar_entry->size;
-
-			return(get_header_tar(tar_stream));
-		}
-	case 'K': {
-			linkname = xmalloc(tar_entry->size + 1);
-                        if(fread(linkname, tar_entry->size, 1, tar_stream) != 1)
-                                return NULL;
-			linkname[tar_entry->size] = '\0';
-			archive_offset += tar_entry->size;
-
-			tar_entry->name = linkname;
-			return(get_header_tar(tar_stream));
-		}
-	case 'D':
-	case 'M':
-	case 'N':
-	case 'S':
-	case 'V':
-		perror_msg("Ignoring GNU extension type %c", tar.formated.typeflag);
-# endif
-        default:
-                perror_msg("Unknown typeflag: 0x%x", tar.formated.typeflag);
-                break;
-
-	}
-
-	return(tar_entry);
-}
-
-void free_header_tar(file_header_t *tar_entry)
-{
-    if (tar_entry == NULL) {
-	return;
-    }
-
-    free(tar_entry->name);
-    free(tar_entry->link_name);
-
-    free(tar_entry);
-}
-
-#endif
-
-#ifdef L_deb_extract
-char *deb_extract(const char *package_filename, FILE *out_stream, 
-		  const int extract_function, const char *prefix, const char *filename)
-{
-	FILE *deb_stream;
-	FILE *uncompressed_stream = NULL;
-	file_header_t *ar_header = NULL;
-	char **file_list = NULL;
-	char *output_buffer = NULL;
-	char *ared_file = NULL;
-	char ar_magic[8];
-	int gunzip_pid;
-
-	if (filename != NULL) {
-		file_list = xmalloc(sizeof(char *) * 2);
-		file_list[0] = xstrdup(filename);
-		file_list[1] = NULL;
-	}
-	
-	if (extract_function & extract_control_tar_gz) {
-		ared_file = xstrdup("control.tar.gz");
-	}
-	else if (extract_function & extract_data_tar_gz) {		
-		ared_file = xstrdup("data.tar.gz");
-	} else {
-                fprintf(stderr, "no file specified to extract -- extract_function=%x\n", extract_function);
-                return NULL;
-        }
-
-	/* open the debian package to be worked on */
-	deb_stream = wfopen(package_filename, "r");
-	if (deb_stream == NULL) {
-		return(NULL);
-	}
-	/* set the buffer size */
-	setvbuf(deb_stream, NULL, _IOFBF, 0x8000);
-
-	/* check ar magic */
-	fread(ar_magic, 1, 8, deb_stream);
-	/*fprintf(stderr, "deb_extract ar_magic=%08x\n", *(long *)ar_magic);*/
-	if (strncmp(ar_magic,"!<arch>",7) == 0) {
-		archive_offset = 8;
-
-		while ((ar_header = get_header_ar(deb_stream)) != NULL) {
-			if (strcmp(ared_file, ar_header->name) == 0) {
-				/* open a stream of decompressed data */
-				uncompressed_stream = gz_open(deb_stream, &gunzip_pid);
-				archive_offset = 0;
-				output_buffer = unarchive(uncompressed_stream, out_stream, get_header_tar, free_header_tar, extract_function, prefix, file_list);
-			}
-			seek_sub_file(deb_stream, ar_header->size);
-		}
-		gz_close(gunzip_pid);
-		fclose(deb_stream);
-		fclose(uncompressed_stream);
-		free(ared_file);
-		return(output_buffer);
-	} else if (strncmp(ar_magic, "\037\213", 2) == 0) {
-		/* it's a gz file, let's assume it's an ipkg */
-		int unzipped_ipkg_pid;
-		FILE *unzipped_ipkg_stream;
-		file_header_t *tar_header;
-		archive_offset = 0;
-		fseek(deb_stream, 0, SEEK_SET);
-		unzipped_ipkg_stream = gz_open(deb_stream, &unzipped_ipkg_pid);
-		
-                /*fprintf(stderr, __FUNCTION__ ": processing ipkg %s -- ared_file=%s\n", package_filename, ared_file);*/
-		/* walk through outer tar file to find ared_file */
-		while ((tar_header = get_header_tar(unzipped_ipkg_stream)) != NULL) {
-                        int name_offset = 0;
-                        if (strncmp(tar_header->name, "./", 2) == 0)
-                                name_offset = 2;
-			if (strcmp(ared_file, tar_header->name+name_offset) == 0) {
-				/* open a stream of decompressed data */
-				uncompressed_stream = gz_open(unzipped_ipkg_stream, &gunzip_pid);
-				archive_offset = 0;
-                                /*fprintf(stderr, __FUNCTION__ ":%d: here -- found file\n", __LINE__);*/
-				output_buffer = unarchive(uncompressed_stream, 
-							  out_stream, 
-							  get_header_tar,
-							  free_header_tar,
-							  extract_function, 
-							  prefix, 
-							  file_list);
-                                /*fprintf(stderr, __FUNCTION__ ":%d: unarchive complete\n", __LINE__);*/
-				free_header_tar(tar_header);
-				gz_close(gunzip_pid);
-				fclose(uncompressed_stream);
-				break;
-			}
-			seek_sub_file(unzipped_ipkg_stream, tar_header->size);
-			free_header_tar(tar_header);
-		}
-		gz_close(unzipped_ipkg_pid);
-		fclose(unzipped_ipkg_stream);
-		fclose(deb_stream);
-		free(ared_file);
-                /*fprintf(stderr, __FUNCTION__ ":%d: done\n", __LINE__);*/
-		return output_buffer; 
-	} else {
-		error_msg_and_die("invalid magic");
-	}
-
-}
-#endif

Copied: trunk/src/target/opkg/libbb/unarchive.c (from rev 3879, trunk/src/target/ipkg/libbb/unarchive.c)

Deleted: trunk/src/target/opkg/libipkg.c
===================================================================
--- trunk/src/target/ipkg/libipkg.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/libipkg.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,527 +0,0 @@
-/* ipkglib.c - the itsy package management system
-
-   Florina 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.
-*/
-
-#ifdef IPKG_LIB
-
-#include "ipkg.h"
-#include "includes.h"
-#include "libipkg.h"
-
-#include "args.h"
-#include "ipkg_conf.h"
-#include "ipkg_cmd.h"
-#include "file_util.h"
-
-
-
-ipkg_message_callback ipkg_cb_message = NULL;
-ipkg_response_callback ipkg_cb_response = NULL;
-ipkg_status_callback ipkg_cb_status = NULL;
-ipkg_list_callback ipkg_cb_list = NULL;
-
-
-int
-ipkg_init (ipkg_message_callback mcall, 
-           ipkg_response_callback rcall,
-           args_t * args)
-{
-	ipkg_cb_message = mcall;
-	ipkg_cb_response = rcall;
-
-	args_init (args);
-
-	return 0;
-}
-
-
-int
-ipkg_deinit (args_t * args)
-{
-	args_deinit (args);
-	ipkg_cb_message = NULL;
-	ipkg_cb_response = NULL;
-
-	/* place other cleanup stuff here */
-
-	return 0;
-}
-
-
-int
-ipkg_packages_list(args_t *args, 
-                   const char *packages, 
-                   ipkg_list_callback cblist,
-                   void *userdata)
-{
-	ipkg_cmd_t *cmd;
-	ipkg_conf_t ipkg_conf;
-	int err;
-
-	err = ipkg_conf_init (&ipkg_conf, args);
-	if (err)
-	{
-		return err;
-	}
-
-	ipkg_cb_list = cblist;
-	/* we need to do this because of static declarations, 
-	 * maybe a good idea to change */
-	cmd = ipkg_cmd_find ("list");
-	if (packages)
-		err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &packages, userdata);
-	else
-		err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, userdata);
-	ipkg_cb_list = NULL;
-	ipkg_conf_deinit (&ipkg_conf);
-	return (err);
-}
-
-
-int
-ipkg_packages_status(args_t *args,
-                     const char *packages,
-                     ipkg_status_callback cbstatus,
-                     void *userdata)
-{
-	ipkg_cmd_t *cmd;
-	ipkg_conf_t ipkg_conf;
-	int err;
-
-	err = ipkg_conf_init (&ipkg_conf, args);
-	if (err)
-	{
-		return err;
-	}
-
-	ipkg_cb_status = cbstatus;
-
-	/* we need to do this because of static declarations,
-	 * maybe a good idea to change */
-	cmd = ipkg_cmd_find ("status");
-	if (packages)
-		err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &packages, userdata);
-	else
-		err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, userdata);
-
-	ipkg_cb_status = NULL;
-	ipkg_conf_deinit (&ipkg_conf);
-	return (err);
-}
-
-
-int
-ipkg_packages_info(args_t *args,
-                   const char *packages,
-                   ipkg_status_callback cbstatus,
-                   void *userdata)
-{
-	ipkg_cmd_t *cmd;
-	ipkg_conf_t ipkg_conf;
-	int err;
-
-	err = ipkg_conf_init (&ipkg_conf, args);
-	if (err)
-	{
-		return err;
-	}
-
-	ipkg_cb_status = cbstatus;
-
-	/* we need to do this because of static declarations,
-	 * maybe a good idea to change */
-	cmd = ipkg_cmd_find ("info");
-	if (packages)
-		err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &packages, userdata);
-	else
-		err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, userdata);
-
-	ipkg_cb_status = NULL;
-	ipkg_conf_deinit (&ipkg_conf);
-	return (err);
-}
-
-
-int
-ipkg_packages_install (args_t * args, const char *name)
-{
-	ipkg_cmd_t *cmd;
-	ipkg_conf_t ipkg_conf;
-	int err;
-
-	/* this error should be handled in application */
-	if (!name || !strlen (name))
-		return (-1);
-
-	err = ipkg_conf_init (&ipkg_conf, args);
-	if (err)
-	{
-		return err;
-	}
-
-	/* we need to do this because of static declarations,
-	 * maybe a good idea to change */
-	cmd = ipkg_cmd_find ("install");
-	err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &name, NULL);
-
-	ipkg_conf_deinit(&ipkg_conf);
-	return (err);
-}
-
-
-int
-ipkg_packages_remove(args_t *args, const char *name, int purge)
-{
-	ipkg_cmd_t *cmd;
-	ipkg_conf_t ipkg_conf;
-	int err;
-
-	/* this error should be handled in application */
-	if (!name || !strlen (name))
-		return (-1);
-
-	err = ipkg_conf_init (&ipkg_conf, args);
-	if (err)
-	{
-		return err;
-	}
-
-	/* we need to do this because of static declarations, 
-	 * maybe a good idea to change */
-	if (purge)
-		cmd = ipkg_cmd_find ("purge");
-	else
-		cmd = ipkg_cmd_find ("remove");
-
-	err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &name, NULL);
-	
-	ipkg_conf_deinit(&ipkg_conf);
-	return (err);
-}
-
-
-int 
-ipkg_lists_update(args_t *args)
-{
-	ipkg_cmd_t *cmd;
-	ipkg_conf_t ipkg_conf;
-	int err;
-
-	err = ipkg_conf_init (&ipkg_conf, args);
-	if (err)
-	{
-		return err;
-	}
-
-	/* we need to do this because of static declarations, 
-	 * maybe a good idea to change */
-	cmd = ipkg_cmd_find ("update");
-
-	err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, NULL);
-	
-	ipkg_conf_deinit(&ipkg_conf);
-	return (err);
-}
-
-
-int 
-ipkg_packages_upgrade(args_t *args)
-{
-	ipkg_cmd_t *cmd;
-	ipkg_conf_t ipkg_conf;
-	int err;
-
-	err = ipkg_conf_init (&ipkg_conf, args);
-	if (err)
-	{
-		return err;
-	}
-
-	/* we need to do this because of static declarations, 
-	 * maybe a good idea to change */
-	cmd = ipkg_cmd_find ("upgrade");
-
-	err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, NULL);
-	
-	ipkg_conf_deinit(&ipkg_conf);
-	return (err);
-}
-
-
-int
-ipkg_packages_download (args_t * args, const char *name)
-{
-	ipkg_cmd_t *cmd;
-	ipkg_conf_t ipkg_conf;
-	int err;
-
-	/* this error should be handled in application */
-	if (!name || !strlen (name))
-		return (-1);
-
-	err = ipkg_conf_init (&ipkg_conf, args);
-	if (err)
-	{
-		return err;
-	}
-
-	/* we need to do this because of static declarations,
-	 * maybe a good idea to change */
-	cmd = ipkg_cmd_find ("download");
-	err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &name, NULL);
-
-	ipkg_conf_deinit(&ipkg_conf);
-	return (err);
-}
-
-
-int
-ipkg_package_files(args_t *args, 
-                   const char *name, 
-                   ipkg_list_callback cblist,
-                   void *userdata)
-{
-	ipkg_cmd_t *cmd;
-	ipkg_conf_t ipkg_conf;
-	int err;
-
-	/* this error should be handled in application */
-	if (!name || !strlen (name))
-		return (-1);
-
-	err = ipkg_conf_init (&ipkg_conf, args);
-	if (err)
-	{
-		return err;
-	}
-
-	ipkg_cb_list = cblist;
-	
-	/* we need to do this because of static declarations, 
-	 * maybe a good idea to change */
-	cmd = ipkg_cmd_find ("files");
-
-	err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &name, userdata);
-	
-	ipkg_cb_list = NULL;
-	ipkg_conf_deinit(&ipkg_conf);
-	return (err);
-}
-
-
-int 
-ipkg_file_search(args_t *args, 
-                const char *file,
-				ipkg_list_callback cblist,
-                void *userdata)
-{
-	ipkg_cmd_t *cmd;
-	ipkg_conf_t ipkg_conf;
-	int err;
-	
-	/* this error should be handled in application */
-	if (!file || !strlen (file))
-		return (-1);
-
-	err = ipkg_conf_init (&ipkg_conf, args);
-	if (err)
-	{
-		return err;
-	}
-
-	ipkg_cb_list = cblist;
-
-	/* we need to do this because of static declarations, 
-	 * maybe a good idea to change */
-	cmd = ipkg_cmd_find ("search");
-	err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &file, userdata);
-	
-	ipkg_cb_list = NULL;
-	ipkg_conf_deinit(&ipkg_conf);
-	return(err);
-}
-
-
-int 
-ipkg_file_what(args_t *args, const char *file, const char* command)
-{
-	ipkg_cmd_t *cmd;
-	ipkg_conf_t ipkg_conf;
-	int err;
-	
-	/* this error should be handled in application */
-	if (!file || !strlen (file))
-		return (-1);
-
-	err = ipkg_conf_init (&ipkg_conf, args);
-	if (err)
-	{
-		return err;
-	}
-
-	/* we need to do this because of static declarations, 
-	 * maybe a good idea to change */
-	cmd = ipkg_cmd_find (command);
-	err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &file, NULL);
-	
-	ipkg_conf_deinit(&ipkg_conf);
-	return(err);
-}
-
-#define ipkg_package_whatdepends(args,file) ipkg_file_what(args,file,"whatdepends")
-#define ipkg_package_whatrecommends(args, file) ipkg_file_what(args,file,"whatrecommends")
-#define ipkg_package_whatprovides(args, file) ipkg_file_what(args,file,"whatprovides")
-#define ipkg_package_whatconflicts(args, file) ipkg_file_what(args,file,"whatconflicts")
-#define ipkg_package_whatreplaces(args, file) ipkg_file_what(args,file,"whatreplaces")
-
-
-int default_ipkg_message_callback(ipkg_conf_t *conf, message_level_t level, 
-				  char *msg)
-{
-     if (conf && (conf->verbosity < level)) {
-	  return 0;
-     } else {
-#ifdef IPKG_LIB
-          if ( level == IPKG_ERROR ){
-             push_error_list(&error_list, msg); 
-//	     printf(msg);
-          } else
-#endif
-	     printf(msg);
-     }
-     return 0;
-}
-
-int default_ipkg_list_callback(char *name, char *desc, char *version, 
-			       pkg_state_status_t status, void *userdata)
-{
-     if (desc)
-	  printf("%s - %s - %s\n", name, version, desc);
-     else
-	  printf("%s - %s\n", name, version);
-     return 0;
-}
-
-int default_ipkg_files_callback(char *name, char *desc, char *version,
-                   pkg_state_status_t status, void *userdata)
-{
-     if (desc)
-	  printf("%s\n", desc);
-     return 0;
-}
-
-int default_ipkg_status_callback(char *name, int istatus, char *desc,
-				 void *userdata)
-{
-     printf("%s\n", desc);
-     return 0;
-}
-
-char* default_ipkg_response_callback(char *question)
-{
-     char *response = NULL;
-     printf(question);
-     fflush(stdout);
-     do {
-	  response = (char *)file_read_line_alloc(stdin);
-     } while (response == NULL);
-     return response;
-}
-
-/* This is used for backward compatibility */
-int
-ipkg_op (int argc, char *argv[])
-{
-	int err, optind;
-	args_t args;
-	char *cmd_name;
-	ipkg_cmd_t *cmd;
-	ipkg_conf_t ipkg_conf;
-
-	args_init (&args);
-
-	optind = args_parse (&args, argc, argv);
-	if (optind == argc || optind < 0)
-	{
-		args_usage ("ipkg must have one sub-command argument");
-	}
-
-	cmd_name = argv[optind++];
-/* Pigi: added a flag to disable the checking of structures if the command does not need to 
-         read anything from there.
-*/
-        if ( !strcmp(cmd_name,"print-architecture") ||
-             !strcmp(cmd_name,"print_architecture") ||
-             !strcmp(cmd_name,"print-installation-architecture") ||
-             !strcmp(cmd_name,"print_installation_architecture") )
-           args.nocheckfordirorfile = 1;
-
-/* Pigi: added a flag to disable the reading of feed files  if the command does not need to 
-         read anything from there.
-*/
-        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") )
-           args.noreadfeedsfile = 1;
-
-
-	err = ipkg_conf_init (&ipkg_conf, &args);
-	if (err)
-	{
-		return err;
-	}
-
-	args_deinit (&args);
-
-	ipkg_cb_message = default_ipkg_message_callback;
-	ipkg_cb_response = default_ipkg_response_callback;
-	ipkg_cb_status = default_ipkg_status_callback;
- 	if ( strcmp(cmd_name, "files")==0)
-	     ipkg_cb_list = default_ipkg_files_callback;
- 	else
-	     ipkg_cb_list = default_ipkg_list_callback;
-
-	cmd = ipkg_cmd_find (cmd_name);
-	if (cmd == NULL)
-	{
-		fprintf (stderr, "%s: unknown sub-command %s\n", argv[0],
-			 cmd_name);
-		args_usage (NULL);
-	}
-
-	if (cmd->requires_args && optind == argc)
-	{
-		fprintf (stderr,
-			 "%s: the ``%s'' command requires at least one argument\n",
-			 __FUNCTION__, cmd_name);
-		args_usage (NULL);
-	}
-
-	err = ipkg_cmd_exec (cmd, &ipkg_conf, argc - optind, (const char **) (argv + optind), NULL);
-
-	ipkg_conf_deinit (&ipkg_conf);
-
-	return err;
-}
-
-#endif /* IPKG_LIB */

Deleted: trunk/src/target/opkg/libipkg.h
===================================================================
--- trunk/src/target/ipkg/libipkg.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/libipkg.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,88 +0,0 @@
-/* ipkglib.h - the itsy package management system
-
-   Florian Boor <florian.boor at kernelconcepts.de>
-
-   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 IPKGLIB_H
-#define IPKGLIB_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#ifdef IPKG_LIB
-
-#include "ipkg_conf.h"
-#include "ipkg_message.h"
-
-#include "args.h"
-#include "pkg.h"
-
-typedef int (*ipkg_message_callback)(ipkg_conf_t *conf, message_level_t level, 
-	char *msg);
-typedef int (*ipkg_list_callback)(char *name, char *desc, char *version, 
-	pkg_state_status_t status, void *userdata);
-typedef int (*ipkg_status_callback)(char *name, int istatus, char *desc,
-	void *userdata);
-typedef char* (*ipkg_response_callback)(char *question);
-
-extern int ipkg_op(int argc, char *argv[]); /* ipkglib.c */
-extern int ipkg_init (ipkg_message_callback mcall, 
-                      ipkg_response_callback rcall,
-					  args_t * args);
-
-extern int ipkg_deinit (args_t *args);
-extern int ipkg_packages_list(args_t *args, 
-                              const char *packages, 
-                              ipkg_list_callback cblist,
-                              void *userdata);
-extern int ipkg_packages_status(args_t *args, 
-                                const char *packages, 
-                                ipkg_status_callback cbstatus,
-								void *userdata);
-extern int ipkg_packages_info(args_t *args,
-                              const char *packages,
-                              ipkg_status_callback cbstatus,
-                              void *userdata);
-extern int ipkg_packages_install(args_t *args, const char *name);
-extern int ipkg_packages_remove(args_t *args, const char *name, int purge);
-extern int ipkg_lists_update(args_t *args);
-extern int ipkg_packages_upgrade(args_t *args);
-extern int ipkg_packages_download(args_t *args, const char *name);
-extern int ipkg_package_files(args_t *args,
-                              const char *name,
-							  ipkg_list_callback cblist,
-							  void *userdata);
-extern int ipkg_file_search(args_t *args,
-                            const char *file,
-							ipkg_list_callback cblist,
-							void *userdata);
-extern int ipkg_package_whatdepends(args_t *args, const char *file);
-extern int ipkg_package_whatrecommends(args_t *args, const char *file);
-extern int ipkg_package_whatprovides(args_t *args, const char *file);
-extern int ipkg_package_whatconflicts(args_t *args, const char *file);
-extern int ipkg_package_whatreplaces(args_t *args, const char *file);
-
-extern ipkg_message_callback ipkg_cb_message; /* ipkglib.c */
-extern ipkg_response_callback ipkg_cb_response;
-extern ipkg_status_callback ipkg_cb_status;
-extern ipkg_list_callback ipkg_cb_list;
-extern void push_error_list(struct errlist **errors,char * msg);
-extern void reverse_error_list(struct errlist **errors);
-extern void free_error_list();
-
-#endif
-
-
-#endif

Deleted: trunk/src/target/opkg/libipkg.pc.in
===================================================================
--- trunk/src/target/ipkg/libipkg.pc.in	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/libipkg.pc.in	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: libipkg
-Description: ipkg package manager library
-Version: @VERSION@
-Libs: -L${libdir} -lipkg
-Cflags: -I${includedir}/libipkg
-

Copied: trunk/src/target/opkg/libopkg.c (from rev 3879, trunk/src/target/ipkg/libopkg.c)

Copied: trunk/src/target/opkg/libopkg.h (from rev 3879, trunk/src/target/ipkg/libopkg.h)

Copied: trunk/src/target/opkg/libopkg.pc.in (from rev 3879, trunk/src/target/ipkg/libopkg.pc.in)

Deleted: trunk/src/target/opkg/md5.c
===================================================================
--- trunk/src/target/ipkg/md5.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/md5.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,658 +0,0 @@
-/* md5.c - Compute MD5 checksum of files or strings according to the
- *         definition of MD5 in RFC 1321 from April 1992.
- * Copyright (C) 1995-1999 Free Software Foundation, Inc.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/* Written by Ulrich Drepper <drepper at gnu.ai.mit.edu> */
-/* Hacked to work with BusyBox by Alfred M. Szmidt <ams at trillian.itslinux.org> */
-
-/* Sucked directly into ipkg since the md5sum functions aren't in libbb
-   Dropped a few functions since ipkg only needs md5_stream.
-   Got rid of evil, twisted defines of FALSE=1 and TRUE=0
-   6 March 2002 Carl Worth <cworth at east.isi.edu>
-*/
-
-/*
- * June 29, 2001        Manuel Novoa III
- *
- * Added MD5SUM_SIZE_VS_SPEED configuration option.
- *
- * Current valid values, with data from my system for comparison, are:
- *   (using uClibc and running on linux-2.4.4.tar.bz2)
- *                     user times (sec)  text size (386)
- *     0 (fastest)         1.1                6144
- *     1                   1.4                5392
- *     2                   3.0                5088
- *     3 (smallest)        5.1                4912
- */
-
-#define MD5SUM_SIZE_VS_SPEED 3
-
-/**********************************************************************/
-
-#include <stdio.h>
-#include <errno.h>
-#include <ctype.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-#include <endian.h>
-#include <sys/types.h>
-#if defined HAVE_LIMITS_H
-# include <limits.h>
-#endif
-
-#include "md5.h"
-
-//----------------------------------------------------------------------------
-//--------md5.c
-//----------------------------------------------------------------------------
-
-/* md5.c - Functions to compute MD5 message digest of files or memory blocks
- *         according to the definition of MD5 in RFC 1321 from April 1992.
- */
-
-/* Written by Ulrich Drepper <drepper at gnu.ai.mit.edu>, 1995.  */
-
-//----------------------------------------------------------------------------
-//--------md5.h
-//----------------------------------------------------------------------------
-
-/* md5.h - Declaration of functions and data types used for MD5 sum
-   computing library functions. */
-
-typedef u_int32_t md5_uint32;
-
-/* Structure to save state of computation between the single steps.  */
-struct md5_ctx
-{
-  md5_uint32 A;
-  md5_uint32 B;
-  md5_uint32 C;
-  md5_uint32 D;
-
-  md5_uint32 total[2];
-  md5_uint32 buflen;
-  char buffer[128];
-};
-
-/*
- * The following three functions are build up the low level used in
- * the functions `md5_stream' and `md5_buffer'.
- */
-
-/* Initialize structure containing state of computation.
-   (RFC 1321, 3.3: Step 3)  */
-static void md5_init_ctx __P ((struct md5_ctx *ctx));
-
-/* Starting with the result of former calls of this function (or the
-   initialization function update the context for the next LEN bytes
-   starting at BUFFER.
-   It is necessary that LEN is a multiple of 64!!! */
-static void md5_process_block __P ((const void *buffer, size_t len,
-				    struct md5_ctx *ctx));
-
-/* Starting with the result of former calls of this function (or the
-   initialization function update the context for the next LEN bytes
-   starting at BUFFER.
-   It is NOT required that LEN is a multiple of 64.  */
-static void md5_process_bytes __P ((const void *buffer, size_t len,
-				    struct md5_ctx *ctx));
-
-/* Process the remaining bytes in the buffer and put result from CTX
-   in first 16 bytes following RESBUF.  The result is always in little
-   endian byte order, so that a byte-wise output yields to the wanted
-   ASCII representation of the message digest.
-
-   IMPORTANT: On some systems it is required that RESBUF is correctly
-   aligned for a 32 bits value.  */
-static void *md5_finish_ctx __P ((struct md5_ctx *ctx, void *resbuf));
-
-//----------------------------------------------------------------------------
-//--------end of md5.h
-//----------------------------------------------------------------------------
-
-/* Handle endian-ness */
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	#define SWAP(n) (n)
-#else
-	#define SWAP(n) ((n << 24) | ((n&65280)<<8) | ((n&16711680)>>8) | (n>>24))
-#endif
-
-
-
-#if MD5SUM_SIZE_VS_SPEED == 0
-/* This array contains the bytes used to pad the buffer to the next
-   64-byte boundary.  (RFC 1321, 3.1: Step 1)  */
-static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */  };
-#endif
-
-/* Initialize structure containing state of computation.
-   (RFC 1321, 3.3: Step 3)  */
-void md5_init_ctx(struct md5_ctx *ctx)
-{
-  ctx->A = 0x67452301;
-  ctx->B = 0xefcdab89;
-  ctx->C = 0x98badcfe;
-  ctx->D = 0x10325476;
-
-  ctx->total[0] = ctx->total[1] = 0;
-  ctx->buflen = 0;
-}
-
-/* Process the remaining bytes in the internal buffer and the usual
-   prolog according to the standard and write the result to RESBUF.
-
-   IMPORTANT: On some systems it is required that RESBUF is correctly
-   aligned for a 32 bits value.  */
-static void *md5_finish_ctx(struct md5_ctx *ctx, void *resbuf)
-{
-  /* Take yet unprocessed bytes into account.  */
-  md5_uint32 bytes = ctx->buflen;
-  size_t pad;
-
-  /* Now count remaining bytes.  */
-  ctx->total[0] += bytes;
-  if (ctx->total[0] < bytes)
-    ++ctx->total[1];
-
-  pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
-#if MD5SUM_SIZE_VS_SPEED > 0
-  memset(&ctx->buffer[bytes], 0, pad);
-  ctx->buffer[bytes] = 0x80;
-#else
-  memcpy(&ctx->buffer[bytes], fillbuf, pad);
-#endif
-
-  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
-  *(md5_uint32 *) & ctx->buffer[bytes + pad] = SWAP(ctx->total[0] << 3);
-  *(md5_uint32 *) & ctx->buffer[bytes + pad + 4] =
-    SWAP( ((ctx->total[1] << 3) | (ctx->total[0] >> 29)) );
-
-  /* Process last bytes.  */
-  md5_process_block(ctx->buffer, bytes + pad + 8, ctx);
-
-/* Put result from CTX in first 16 bytes following RESBUF.  The result is
-   always in little endian byte order, so that a byte-wise output yields
-   to the wanted ASCII representation of the message digest.
-
-   IMPORTANT: On some systems it is required that RESBUF is correctly
-   aligned for a 32 bits value.  */
-  ((md5_uint32 *) resbuf)[0] = SWAP(ctx->A);
-  ((md5_uint32 *) resbuf)[1] = SWAP(ctx->B);
-  ((md5_uint32 *) resbuf)[2] = SWAP(ctx->C);
-  ((md5_uint32 *) resbuf)[3] = SWAP(ctx->D);
-
-  return resbuf;
-}
-
-/* Compute MD5 message digest for bytes read from STREAM.  The
-   resulting message digest number will be written into the 16 bytes
-   beginning at RESBLOCK.  */
-int md5_stream(FILE *stream, void *resblock)
-{
-  /* Important: BLOCKSIZE must be a multiple of 64.  */
-static const int BLOCKSIZE = 4096;
-  struct md5_ctx ctx;
-  char buffer[BLOCKSIZE + 72];
-  size_t sum;
-
-  /* Initialize the computation context.  */
-  md5_init_ctx(&ctx);
-
-  /* Iterate over full file contents.  */
-  while (1) {
-    /* We read the file in blocks of BLOCKSIZE bytes.  One call of the
-       computation function processes the whole buffer so that with the
-       next round of the loop another block can be read.  */
-    size_t n;
-    sum = 0;
-
-    /* Read block.  Take care for partial reads.  */
-    do {
-      n = fread(buffer + sum, 1, BLOCKSIZE - sum, stream);
-
-      sum += n;
-    }
-    while (sum < BLOCKSIZE && n != 0);
-    if (n == 0 && ferror(stream))
-      return 1;
-
-    /* If end of file is reached, end the loop.  */
-    if (n == 0)
-      break;
-
-    /* Process buffer with BLOCKSIZE bytes.  Note that
-       BLOCKSIZE % 64 == 0
-    */
-    md5_process_block(buffer, BLOCKSIZE, &ctx);
-  }
-
-  /* Add the last bytes if necessary.  */
-  if (sum > 0)
-    md5_process_bytes(buffer, sum, &ctx);
-
-  /* Construct result in desired memory.  */
-  md5_finish_ctx(&ctx, resblock);
-  return 0;
-}
-
-/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
-   result is always in little endian byte order, so that a byte-wise
-   output yields to the wanted ASCII representation of the message
-   digest.  */
-void *md5_buffer(const char *buffer, size_t len, void *resblock)
-{
-  struct md5_ctx ctx;
-
-  /* Initialize the computation context.  */
-  md5_init_ctx(&ctx);
-
-  /* Process whole buffer but last len % 64 bytes.  */
-  md5_process_bytes(buffer, len, &ctx);
-
-  /* Put result in desired memory area.  */
-  return md5_finish_ctx(&ctx, resblock);
-}
-
-static void md5_process_bytes(const void *buffer, size_t len, struct md5_ctx *ctx)
-{
-  /* When we already have some bits in our internal buffer concatenate
-     both inputs first.  */
-  if (ctx->buflen != 0) {
-    size_t left_over = ctx->buflen;
-    size_t add = 128 - left_over > len ? len : 128 - left_over;
-
-    memcpy(&ctx->buffer[left_over], buffer, add);
-    ctx->buflen += add;
-
-    if (left_over + add > 64) {
-      md5_process_block(ctx->buffer, (left_over + add) & ~63, ctx);
-      /* The regions in the following copy operation cannot overlap.  */
-      memcpy(ctx->buffer, &ctx->buffer[(left_over + add) & ~63],
-	     (left_over + add) & 63);
-      ctx->buflen = (left_over + add) & 63;
-    }
-
-    buffer = (const char *) buffer + add;
-    len -= add;
-  }
-
-  /* Process available complete blocks.  */
-  if (len > 64) {
-    md5_process_block(buffer, len & ~63, ctx);
-    buffer = (const char *) buffer + (len & ~63);
-    len &= 63;
-  }
-
-  /* Move remaining bytes in internal buffer.  */
-  if (len > 0) {
-    memcpy(ctx->buffer, buffer, len);
-    ctx->buflen = len;
-  }
-}
-
-/* These are the four functions used in the four steps of the MD5 algorithm
-   and defined in the RFC 1321.  The first function is a little bit optimized
-   (as found in Colin Plumbs public domain implementation).  */
-/* #define FF(b, c, d) ((b & c) | (~b & d)) */
-#define FF(b, c, d) (d ^ (b & (c ^ d)))
-#define FG(b, c, d) FF (d, b, c)
-#define FH(b, c, d) (b ^ c ^ d)
-#define FI(b, c, d) (c ^ (b | ~d))
-
-/* Process LEN bytes of BUFFER, accumulating context into CTX.
-   It is assumed that LEN % 64 == 0.  */
-static void md5_process_block(const void *buffer, size_t len, struct md5_ctx *ctx)
-{
-  md5_uint32 correct_words[16];
-  const md5_uint32 *words = buffer;
-  size_t nwords = len / sizeof(md5_uint32);
-  const md5_uint32 *endp = words + nwords;
-#if MD5SUM_SIZE_VS_SPEED > 0
-  static const md5_uint32 C_array[] = {
-      /* round 1 */
-      0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
-      0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
-      0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
-      0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
-      /* round 2 */
-      0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
-      0xd62f105d, 0x2441453,  0xd8a1e681, 0xe7d3fbc8,
-      0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
-      0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
-      /* round 3 */
-      0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
-      0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
-      0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x4881d05,
-      0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
-      /* round 4 */
-      0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
-      0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
-      0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
-      0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391
-  };
-
-  static const char P_array[] = {
-#if MD5SUM_SIZE_VS_SPEED > 1
-      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* 1 */
-#endif
-      1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, /* 2 */
-      5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2, /* 3 */
-      0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9  /* 4 */
-  };
-
-#if MD5SUM_SIZE_VS_SPEED > 1
-  static const char S_array[] = {
-      7, 12, 17, 22,
-      5, 9, 14, 20,
-      4, 11, 16, 23,
-      6, 10, 15, 21
-  };
-#endif
-#endif
-
-  md5_uint32 A = ctx->A;
-  md5_uint32 B = ctx->B;
-  md5_uint32 C = ctx->C;
-  md5_uint32 D = ctx->D;
-
-  /* First increment the byte count.  RFC 1321 specifies the possible
-     length of the file up to 2^64 bits.  Here we only compute the
-     number of bytes.  Do a double word increment.  */
-  ctx->total[0] += len;
-  if (ctx->total[0] < len)
-    ++ctx->total[1];
-
-  /* Process all bytes in the buffer with 64 bytes in each round of
-     the loop.  */
-  while (words < endp) {
-    md5_uint32 *cwp = correct_words;
-    md5_uint32 A_save = A;
-    md5_uint32 B_save = B;
-    md5_uint32 C_save = C;
-    md5_uint32 D_save = D;
-
-#if MD5SUM_SIZE_VS_SPEED > 1
-#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
-
-    const md5_uint32 *pc;
-    const char *pp;
-    const char *ps;
-    int i;
-    md5_uint32 temp;
-
-    for ( i=0 ; i < 16 ; i++ ) {
-	cwp[i] = SWAP(words[i]);
-    }
-    words += 16;
-
-#if MD5SUM_SIZE_VS_SPEED > 2
-    pc = C_array; pp = P_array; ps = S_array - 4;
-
-    for ( i = 0 ; i < 64 ; i++ ) {
-	if ((i&0x0f) == 0) ps += 4;
-	temp = A;
-	switch (i>>4) {
-	    case 0:
-		temp += FF(B,C,D);
-		break;
-	    case 1:
-		temp += FG(B,C,D);
-		break;
-	    case 2:
-		temp += FH(B,C,D);
-		break;
-	    case 3:
-		temp += FI(B,C,D);
-	}
-	temp += cwp[(int)(*pp++)] + *pc++;
-	temp = CYCLIC (temp, ps[i&3]);
-	temp += B;
-	A = D; D = C; C = B; B = temp;
-    }
-#else
-    pc = C_array; pp = P_array; ps = S_array;
-
-    for ( i = 0 ; i < 16 ; i++ ) {
-	temp = A + FF(B,C,D) + cwp[(int)(*pp++)] + *pc++;
-	temp = CYCLIC (temp, ps[i&3]);
-	temp += B;
-	A = D; D = C; C = B; B = temp;
-    }
-
-    ps += 4;
-    for ( i = 0 ; i < 16 ; i++ ) {
-	temp = A + FG(B,C,D) + cwp[(int)(*pp++)] + *pc++;
-	temp = CYCLIC (temp, ps[i&3]);
-	temp += B;
-	A = D; D = C; C = B; B = temp;
-    }
-    ps += 4;
-    for ( i = 0 ; i < 16 ; i++ ) {
-	temp = A + FH(B,C,D) + cwp[(int)(*pp++)] + *pc++;
-	temp = CYCLIC (temp, ps[i&3]);
-	temp += B;
-	A = D; D = C; C = B; B = temp;
-    }
-    ps += 4;
-    for ( i = 0 ; i < 16 ; i++ ) {
-	temp = A + FI(B,C,D) + cwp[(int)(*pp++)] + *pc++;
-	temp = CYCLIC (temp, ps[i&3]);
-	temp += B;
-	A = D; D = C; C = B; B = temp;
-    }
-
-#endif
-#else
-    /* First round: using the given function, the context and a constant
-       the next context is computed.  Because the algorithms processing
-       unit is a 32-bit word and it is determined to work on words in
-       little endian byte order we perhaps have to change the byte order
-       before the computation.  To reduce the work for the next steps
-       we store the swapped words in the array CORRECT_WORDS.  */
-
-#define OP(a, b, c, d, s, T)						\
-      do								\
-        {								\
-	  a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T;		\
-	  ++words;							\
-	  CYCLIC (a, s);						\
-	  a += b;							\
-        }								\
-      while (0)
-
-    /* It is unfortunate that C does not provide an operator for
-       cyclic rotation.  Hope the C compiler is smart enough.  */
-    /* gcc 2.95.4 seems to be --aaronl */
-#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
-
-    /* Before we start, one word to the strange constants.
-       They are defined in RFC 1321 as
-
-       T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
-    */
-
-#if MD5SUM_SIZE_VS_SPEED == 1
-    const md5_uint32 *pc;
-    const char *pp;
-    int i;
-#endif
-
-    /* Round 1.  */
-#if MD5SUM_SIZE_VS_SPEED == 1
-    pc = C_array;
-    for ( i=0 ; i < 4 ; i++ ) {
-	OP(A, B, C, D, 7, *pc++);
-	OP(D, A, B, C, 12, *pc++);
-	OP(C, D, A, B, 17, *pc++);
-	OP(B, C, D, A, 22, *pc++);
-    }
-#else
-    OP(A, B, C, D, 7, 0xd76aa478);
-    OP(D, A, B, C, 12, 0xe8c7b756);
-    OP(C, D, A, B, 17, 0x242070db);
-    OP(B, C, D, A, 22, 0xc1bdceee);
-    OP(A, B, C, D, 7, 0xf57c0faf);
-    OP(D, A, B, C, 12, 0x4787c62a);
-    OP(C, D, A, B, 17, 0xa8304613);
-    OP(B, C, D, A, 22, 0xfd469501);
-    OP(A, B, C, D, 7, 0x698098d8);
-    OP(D, A, B, C, 12, 0x8b44f7af);
-    OP(C, D, A, B, 17, 0xffff5bb1);
-    OP(B, C, D, A, 22, 0x895cd7be);
-    OP(A, B, C, D, 7, 0x6b901122);
-    OP(D, A, B, C, 12, 0xfd987193);
-    OP(C, D, A, B, 17, 0xa679438e);
-    OP(B, C, D, A, 22, 0x49b40821);
-#endif
-
-    /* For the second to fourth round we have the possibly swapped words
-       in CORRECT_WORDS.  Redefine the macro to take an additional first
-       argument specifying the function to use.  */
-#undef OP
-#define OP(f, a, b, c, d, k, s, T)					\
-      do 								\
-	{								\
-	  a += f (b, c, d) + correct_words[k] + T;			\
-	  CYCLIC (a, s);						\
-	  a += b;							\
-	}								\
-      while (0)
-
-    /* Round 2.  */
-#if MD5SUM_SIZE_VS_SPEED == 1
-    pp = P_array;
-    for ( i=0 ; i < 4 ; i++ ) {
-	OP(FG, A, B, C, D, (int)(*pp++), 5, *pc++);
-	OP(FG, D, A, B, C, (int)(*pp++), 9, *pc++);
-	OP(FG, C, D, A, B, (int)(*pp++), 14, *pc++);
-	OP(FG, B, C, D, A, (int)(*pp++), 20, *pc++);
-    }
-#else
-    OP(FG, A, B, C, D, 1, 5, 0xf61e2562);
-    OP(FG, D, A, B, C, 6, 9, 0xc040b340);
-    OP(FG, C, D, A, B, 11, 14, 0x265e5a51);
-    OP(FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
-    OP(FG, A, B, C, D, 5, 5, 0xd62f105d);
-    OP(FG, D, A, B, C, 10, 9, 0x02441453);
-    OP(FG, C, D, A, B, 15, 14, 0xd8a1e681);
-    OP(FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
-    OP(FG, A, B, C, D, 9, 5, 0x21e1cde6);
-    OP(FG, D, A, B, C, 14, 9, 0xc33707d6);
-    OP(FG, C, D, A, B, 3, 14, 0xf4d50d87);
-    OP(FG, B, C, D, A, 8, 20, 0x455a14ed);
-    OP(FG, A, B, C, D, 13, 5, 0xa9e3e905);
-    OP(FG, D, A, B, C, 2, 9, 0xfcefa3f8);
-    OP(FG, C, D, A, B, 7, 14, 0x676f02d9);
-    OP(FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
-#endif
-
-    /* Round 3.  */
-#if MD5SUM_SIZE_VS_SPEED == 1
-    for ( i=0 ; i < 4 ; i++ ) {
-	OP(FH, A, B, C, D, (int)(*pp++), 4, *pc++);
-	OP(FH, D, A, B, C, (int)(*pp++), 11, *pc++);
-	OP(FH, C, D, A, B, (int)(*pp++), 16, *pc++);
-	OP(FH, B, C, D, A, (int)(*pp++), 23, *pc++);
-    }
-#else
-    OP(FH, A, B, C, D, 5, 4, 0xfffa3942);
-    OP(FH, D, A, B, C, 8, 11, 0x8771f681);
-    OP(FH, C, D, A, B, 11, 16, 0x6d9d6122);
-    OP(FH, B, C, D, A, 14, 23, 0xfde5380c);
-    OP(FH, A, B, C, D, 1, 4, 0xa4beea44);
-    OP(FH, D, A, B, C, 4, 11, 0x4bdecfa9);
-    OP(FH, C, D, A, B, 7, 16, 0xf6bb4b60);
-    OP(FH, B, C, D, A, 10, 23, 0xbebfbc70);
-    OP(FH, A, B, C, D, 13, 4, 0x289b7ec6);
-    OP(FH, D, A, B, C, 0, 11, 0xeaa127fa);
-    OP(FH, C, D, A, B, 3, 16, 0xd4ef3085);
-    OP(FH, B, C, D, A, 6, 23, 0x04881d05);
-    OP(FH, A, B, C, D, 9, 4, 0xd9d4d039);
-    OP(FH, D, A, B, C, 12, 11, 0xe6db99e5);
-    OP(FH, C, D, A, B, 15, 16, 0x1fa27cf8);
-    OP(FH, B, C, D, A, 2, 23, 0xc4ac5665);
-#endif
-
-    /* Round 4.  */
-#if MD5SUM_SIZE_VS_SPEED == 1
-    for ( i=0 ; i < 4 ; i++ ) {
-	OP(FI, A, B, C, D, (int)(*pp++), 6, *pc++);
-	OP(FI, D, A, B, C, (int)(*pp++), 10, *pc++);
-	OP(FI, C, D, A, B, (int)(*pp++), 15, *pc++);
-	OP(FI, B, C, D, A, (int)(*pp++), 21, *pc++);
-    }
-#else
-    OP(FI, A, B, C, D, 0, 6, 0xf4292244);
-    OP(FI, D, A, B, C, 7, 10, 0x432aff97);
-    OP(FI, C, D, A, B, 14, 15, 0xab9423a7);
-    OP(FI, B, C, D, A, 5, 21, 0xfc93a039);
-    OP(FI, A, B, C, D, 12, 6, 0x655b59c3);
-    OP(FI, D, A, B, C, 3, 10, 0x8f0ccc92);
-    OP(FI, C, D, A, B, 10, 15, 0xffeff47d);
-    OP(FI, B, C, D, A, 1, 21, 0x85845dd1);
-    OP(FI, A, B, C, D, 8, 6, 0x6fa87e4f);
-    OP(FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
-    OP(FI, C, D, A, B, 6, 15, 0xa3014314);
-    OP(FI, B, C, D, A, 13, 21, 0x4e0811a1);
-    OP(FI, A, B, C, D, 4, 6, 0xf7537e82);
-    OP(FI, D, A, B, C, 11, 10, 0xbd3af235);
-    OP(FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
-    OP(FI, B, C, D, A, 9, 21, 0xeb86d391);
-#endif
-#endif
-
-    /* Add the starting values of the context.  */
-    A += A_save;
-    B += B_save;
-    C += C_save;
-    D += D_save;
-  }
-
-  /* Put checksum in context given as argument.  */
-  ctx->A = A;
-  ctx->B = B;
-  ctx->C = C;
-  ctx->D = D;
-}
-
-//----------------------------------------------------------------------------
-//--------end of md5.c
-//----------------------------------------------------------------------------
-
-#define ISWHITE(c) ((c) == ' ' || (c) == '\t')
-#define ISXDIGIT(c) (isxdigit (c))
-
-/* The minimum length of a valid digest line in a file produced
-   by `md5sum FILE' and read by `md5sum -c'.  This length does
-   not include any newline character at the end of a line.  */
-static const int MIN_DIGEST_LINE_LENGTH = 35; /* 32 - message digest length
-                                      2 - blank and binary indicator
-                                      1 - minimum filename length */
-
-static inline int hex_digits(unsigned char const *s)
-{
-  while (*s) {
-    if (!ISXDIGIT(*s))
-      return 0;
-    ++s;
-  }
-  return 1;
-}
-
-

Copied: trunk/src/target/opkg/md5.c (from rev 3879, trunk/src/target/ipkg/md5.c)

Deleted: trunk/src/target/opkg/nv_pair.c
===================================================================
--- trunk/src/target/ipkg/nv_pair.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/nv_pair.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,40 +0,0 @@
-/* nv_pair.c - 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.
-*/
-
-#include "ipkg.h"
-
-#include "nv_pair.h"
-#include "str_util.h"
-
-int nv_pair_init(nv_pair_t *nv_pair, const char *name, const char *value)
-{
-    nv_pair->name = str_dup_safe(name);
-    nv_pair->value = str_dup_safe(value);
-
-    return 0;
-}
-
-void nv_pair_deinit(nv_pair_t *nv_pair)
-{
-    free(nv_pair->name);
-    nv_pair->name = NULL;
-
-    free(nv_pair->value);
-    nv_pair->value = NULL;
-}
-
-

Copied: trunk/src/target/opkg/nv_pair.c (from rev 3879, trunk/src/target/ipkg/nv_pair.c)

Deleted: trunk/src/target/opkg/nv_pair_list.c
===================================================================
--- trunk/src/target/ipkg/nv_pair_list.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/nv_pair_list.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,98 +0,0 @@
-/* nv_pair_list.c - 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.
-*/
-
-#include "ipkg.h"
-
-#include "nv_pair.h"
-#include "void_list.h"
-#include "nv_pair_list.h"
-
-int nv_pair_list_elt_init(nv_pair_list_elt_t *elt, nv_pair_t *data)
-{
-    return void_list_elt_init((void_list_elt_t *) elt, data);
-}
-
-void nv_pair_list_elt_deinit(nv_pair_list_elt_t *elt)
-{
-    void_list_elt_deinit((void_list_elt_t *) elt);
-}
-
-int nv_pair_list_init(nv_pair_list_t *list)
-{
-    return void_list_init((void_list_t *) list);
-}
-
-void nv_pair_list_deinit(nv_pair_list_t *list)
-{
-    nv_pair_list_elt_t *iter;
-    nv_pair_t *nv_pair;
-
-    for (iter = list->head; iter; iter = iter->next) {
-	nv_pair = iter->data;
-	nv_pair_deinit(nv_pair);
-
-	/* malloced in nv_pair_list_append */
-	free(nv_pair);
-	iter->data = NULL;
-    }
-    void_list_deinit((void_list_t *) list);
-}
-
-nv_pair_t *nv_pair_list_append(nv_pair_list_t *list, const char *name, const char *value)
-{
-    int err;
-
-    /* freed in nv_pair_list_deinit */
-    nv_pair_t *nv_pair = malloc(sizeof(nv_pair_t));
-
-    if (nv_pair == NULL) {
-	fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	return NULL;
-    }
-    nv_pair_init(nv_pair, name, value);
-
-    err = void_list_append((void_list_t *) list, nv_pair);
-    if (err) {
-	return NULL;
-    }
-
-    return nv_pair;
-}
-
-int nv_pair_list_push(nv_pair_list_t *list, nv_pair_t *data)
-{
-    return void_list_push((void_list_t *) list, data);
-}
-
-nv_pair_list_elt_t *nv_pair_list_pop(nv_pair_list_t *list)
-{
-    return (nv_pair_list_elt_t *) void_list_pop((void_list_t *) list);
-}
-
-char *nv_pair_list_find(nv_pair_list_t *list, char *name)
-{
-     nv_pair_list_elt_t *iter;
-     nv_pair_t *nv_pair;
-
-     for (iter = list->head; iter; iter = iter->next) {
-	  nv_pair = iter->data;
-	  if (strcmp(nv_pair->name, name) == 0) {
-	       return nv_pair->value;
-	  }
-     }    
-     return NULL;
-}

Copied: trunk/src/target/opkg/nv_pair_list.c (from rev 3879, trunk/src/target/ipkg/nv_pair_list.c)

Copied: trunk/src/target/opkg/opkg-frontend.c (from rev 3879, trunk/src/target/ipkg/opkg-frontend.c)

Copied: trunk/src/target/opkg/opkg.c (from rev 3879, trunk/src/target/ipkg/opkg.c)

Copied: trunk/src/target/opkg/opkg.h (from rev 3879, trunk/src/target/ipkg/opkg.h)

Copied: trunk/src/target/opkg/opkg.h.in (from rev 3879, trunk/src/target/ipkg/opkg.h.in)

Copied: trunk/src/target/opkg/opkg_cmd.c (from rev 3879, trunk/src/target/ipkg/opkg_cmd.c)

Copied: trunk/src/target/opkg/opkg_cmd.h (from rev 3879, trunk/src/target/ipkg/opkg_cmd.h)

Copied: trunk/src/target/opkg/opkg_conf.c (from rev 3879, trunk/src/target/ipkg/opkg_conf.c)

Copied: trunk/src/target/opkg/opkg_conf.h (from rev 3879, trunk/src/target/ipkg/opkg_conf.h)

Copied: trunk/src/target/opkg/opkg_configure.c (from rev 3879, trunk/src/target/ipkg/opkg_configure.c)

Copied: trunk/src/target/opkg/opkg_configure.h (from rev 3879, trunk/src/target/ipkg/opkg_configure.h)

Copied: trunk/src/target/opkg/opkg_download.c (from rev 3879, trunk/src/target/ipkg/opkg_download.c)

Copied: trunk/src/target/opkg/opkg_download.h (from rev 3879, trunk/src/target/ipkg/opkg_download.h)

Copied: trunk/src/target/opkg/opkg_extract_test.c (from rev 3879, trunk/src/target/ipkg/opkg_extract_test.c)

Copied: trunk/src/target/opkg/opkg_hash_test.c (from rev 3879, trunk/src/target/ipkg/opkg_hash_test.c)

Copied: trunk/src/target/opkg/opkg_install.c (from rev 3879, trunk/src/target/ipkg/opkg_install.c)

Copied: trunk/src/target/opkg/opkg_install.h (from rev 3879, trunk/src/target/ipkg/opkg_install.h)

Copied: trunk/src/target/opkg/opkg_message.c (from rev 3879, trunk/src/target/ipkg/opkg_message.c)

Copied: trunk/src/target/opkg/opkg_message.h (from rev 3879, trunk/src/target/ipkg/opkg_message.h)

Copied: trunk/src/target/opkg/opkg_remove.c (from rev 3879, trunk/src/target/ipkg/opkg_remove.c)

Copied: trunk/src/target/opkg/opkg_remove.h (from rev 3879, trunk/src/target/ipkg/opkg_remove.h)

Copied: trunk/src/target/opkg/opkg_upgrade.c (from rev 3879, trunk/src/target/ipkg/opkg_upgrade.c)

Copied: trunk/src/target/opkg/opkg_upgrade.h (from rev 3879, trunk/src/target/ipkg/opkg_upgrade.h)

Copied: trunk/src/target/opkg/opkg_utils.c (from rev 3879, trunk/src/target/ipkg/opkg_utils.c)

Copied: trunk/src/target/opkg/opkg_utils.h (from rev 3879, trunk/src/target/ipkg/opkg_utils.h)

Deleted: trunk/src/target/opkg/pkg.c
===================================================================
--- trunk/src/target/ipkg/pkg.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,1754 +0,0 @@
-/* pkg.c - 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.
-*/
-
-#include "ipkg.h"
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-
-#include "pkg.h"
-
-#include "pkg_parse.h"
-#include "pkg_extract.h"
-#include "ipkg_message.h"
-#include "ipkg_utils.h"
-
-#include "sprintf_alloc.h"
-#include "file_util.h"
-#include "str_util.h"
-#include "xsystem.h"
-#include "ipkg_conf.h"
-
-typedef struct enum_map enum_map_t;
-struct enum_map
-{
-     int value;
-     char *str;
-};
-
-static const enum_map_t pkg_state_want_map[] = {
-     { SW_UNKNOWN, "unknown"},
-     { SW_INSTALL, "install"},
-     { SW_DEINSTALL, "deinstall"},
-     { SW_PURGE, "purge"}
-};
-
-static const enum_map_t pkg_state_flag_map[] = {
-     { SF_OK, "ok"},
-     { SF_REINSTREQ, "reinstreq"},
-     { SF_HOLD, "hold"},
-     { SF_REPLACE, "replace"},
-     { SF_NOPRUNE, "noprune"},
-     { SF_PREFER, "prefer"},
-     { SF_OBSOLETE, "obsolete"},
-     { SF_USER, "user"},
-};
-
-static const enum_map_t pkg_state_status_map[] = {
-     { SS_NOT_INSTALLED, "not-installed" },
-     { SS_UNPACKED, "unpacked" },
-     { SS_HALF_CONFIGURED, "half-configured" },
-     { SS_INSTALLED, "installed" },
-     { SS_HALF_INSTALLED, "half-installed" },
-     { SS_CONFIG_FILES, "config-files" },
-     { SS_POST_INST_FAILED, "post-inst-failed" },
-     { SS_REMOVAL_FAILED, "removal-failed" }
-};
-
-static int verrevcmp(const char *val, const char *ref);
-
-
-pkg_t *pkg_new(void)
-{
-     pkg_t *pkg;
-
-     pkg = malloc(sizeof(pkg_t));
-     if (pkg == NULL) {
-	  fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	  return NULL;
-     }
-
-     pkg_init(pkg);
-
-     return pkg;
-}
-
-int pkg_init(pkg_t *pkg)
-{
-     memset(pkg, 0, sizeof(pkg_t));
-     pkg->name = NULL;
-     pkg->epoch = 0;
-     pkg->version = NULL;
-     pkg->revision = NULL;
-     pkg->familiar_revision = NULL;
-     pkg->dest = NULL;
-     pkg->src = NULL;
-     pkg->architecture = NULL;
-     pkg->maintainer = NULL;
-     pkg->section = NULL;
-     pkg->description = NULL;
-     pkg->state_want = SW_UNKNOWN;
-     pkg->state_flag = SF_OK;
-     pkg->state_status = SS_NOT_INSTALLED;
-     pkg->depends_str = NULL;
-     pkg->provides_str = NULL;
-     pkg->depends_count = 0;
-     pkg->depends = NULL;
-     pkg->suggests_str = NULL;
-     pkg->recommends_str = NULL;
-     pkg->suggests_count = 0;
-     pkg->recommends_count = 0;
-
-     /* Abhaya: added init for conflicts fields */
-     pkg->conflicts = NULL;
-     pkg->conflicts_count = 0;
-
-     /* added for replaces.  Jamey 7/23/2002 */
-     pkg->replaces = NULL;
-     pkg->replaces_count = 0;
-    
-     pkg->pre_depends_count = 0;
-     pkg->pre_depends_str = NULL;
-     pkg->provides_count = 0;
-     pkg->provides = NULL;
-     pkg->filename = NULL;
-     pkg->local_filename = NULL;
-     pkg->tmp_unpack_dir = NULL;
-     pkg->md5sum = NULL;
-     pkg->size = NULL;
-     pkg->installed_size = NULL;
-     pkg->priority = NULL;
-     pkg->source = NULL;
-     conffile_list_init(&pkg->conffiles);
-     pkg->installed_files = NULL;
-     pkg->installed_files_ref_cnt = 0;
-     pkg->essential = 0;
-     pkg->provided_by_hand = 0;
-
-     return 0;
-}
-
-void pkg_deinit(pkg_t *pkg)
-{
-     free(pkg->name);
-     pkg->name = NULL;
-     pkg->epoch = 0;
-     free(pkg->version);
-     pkg->version = NULL;
-     /* revision and familiar_revision share storage with version, so
-	don't free */
-     pkg->revision = NULL;
-     pkg->familiar_revision = NULL;
-     /* owned by ipkg_conf_t */
-     pkg->dest = NULL;
-     /* owned by ipkg_conf_t */
-     pkg->src = NULL;
-     free(pkg->architecture);
-     pkg->architecture = NULL;
-     free(pkg->maintainer);
-     pkg->maintainer = NULL;
-     free(pkg->section);
-     pkg->section = NULL;
-     free(pkg->description);
-     pkg->description = NULL;
-     pkg->state_want = SW_UNKNOWN;
-     pkg->state_flag = SF_OK;
-     pkg->state_status = SS_NOT_INSTALLED;
-     free(pkg->depends_str);
-     pkg->depends_str = NULL;
-     free(pkg->provides_str);
-     pkg->provides_str = NULL;
-     pkg->depends_count = 0;
-     /* XXX: CLEANUP: MEMORY_LEAK: how to free up pkg->depends ? */
-     pkg->pre_depends_count = 0;
-     free(pkg->pre_depends_str);
-     pkg->pre_depends_str = NULL;
-     pkg->provides_count = 0;
-     /* XXX: CLEANUP: MEMORY_LEAK: how to free up pkg->provides ? */
-     /* XXX: CLEANUP: MEMORY_LEAK: how to free up pkg->suggests ? */
-     free(pkg->filename);
-     pkg->filename = NULL;
-     free(pkg->local_filename);
-     pkg->local_filename = NULL;
-     /* CLEANUP: It'd be nice to pullin the cleanup function from
-	ipkg_install.c here. See comment in
-	ipkg_install.c:cleanup_temporary_files */
-     free(pkg->tmp_unpack_dir);
-     pkg->tmp_unpack_dir = NULL;
-     free(pkg->md5sum);
-     pkg->md5sum = NULL;
-     free(pkg->size);
-     pkg->size = NULL;
-     free(pkg->installed_size);
-     pkg->installed_size = NULL;
-     free(pkg->priority);
-     pkg->priority = NULL;
-     free(pkg->source);
-     pkg->source = NULL;
-     conffile_list_deinit(&pkg->conffiles);
-     /* XXX: QUESTION: Is forcing this to 1 correct? I suppose so,
-	since if they are calling deinit, they should know. Maybe do an
-	assertion here instead? */
-     pkg->installed_files_ref_cnt = 1;
-     pkg_free_installed_files(pkg);
-     pkg->essential = 0;
-}
-
-int pkg_init_from_file(pkg_t *pkg, const char *filename)
-{
-     int err;
-     char **raw;
-     FILE *control_file;
-
-     err = pkg_init(pkg);
-     if (err) { return err; }
-
-     pkg->local_filename = strdup(filename);
-    
-     control_file = tmpfile();
-     err = pkg_extract_control_file_to_stream(pkg, control_file);
-     if (err) { return err; }
-
-     rewind(control_file);
-     raw = read_raw_pkgs_from_stream(control_file);
-     pkg_parse_raw(pkg, &raw, NULL, NULL);
-
-     fclose(control_file);
-
-     return 0;
-}
-
-/* Merge any new information in newpkg into oldpkg */
-/* XXX: CLEANUP: This function shouldn't actually modify anything in
-   newpkg, but should leave it usable. This rework is so that
-   pkg_hash_insert doesn't clobber the pkg that you pass into it. */
-/* 
- * uh, i thought that i had originally written this so that it took 
- * two pkgs and returned a new one?  we can do that again... -sma
- */
-int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status)
-{
-     if (oldpkg == newpkg) {
-	  return 0;
-     }
-
-     if (!oldpkg->src)
-	  oldpkg->src = newpkg->src;
-     if (!oldpkg->dest)
-	  oldpkg->dest = newpkg->dest;
-     if (!oldpkg->architecture)
-	  oldpkg->architecture = str_dup_safe(newpkg->architecture);
-     if (!oldpkg->arch_priority)
-	  oldpkg->arch_priority = newpkg->arch_priority;
-     if (!oldpkg->section)
-	  oldpkg->section = str_dup_safe(newpkg->section);
-     if(!oldpkg->maintainer)
-	  oldpkg->maintainer = str_dup_safe(newpkg->maintainer);
-     if(!oldpkg->description)
-	  oldpkg->description = str_dup_safe(newpkg->description);
-     if (set_status) {
-	  /* merge the state_flags from the new package */
-	  oldpkg->state_want = newpkg->state_want;
-	  oldpkg->state_status = newpkg->state_status;
-	  oldpkg->state_flag = newpkg->state_flag;
-     } else {
-	  if (oldpkg->state_want == SW_UNKNOWN)
-	       oldpkg->state_want = newpkg->state_want;
-	  if (oldpkg->state_status == SS_NOT_INSTALLED)
-	       oldpkg->state_status = newpkg->state_status;
-	  oldpkg->state_flag |= newpkg->state_flag;
-     }
-
-     if (!oldpkg->depends_str && !oldpkg->pre_depends_str && !oldpkg->recommends_str && !oldpkg->suggests_str) {
-	  oldpkg->depends_str = newpkg->depends_str;
-	  newpkg->depends_str = NULL;
-	  oldpkg->depends_count = newpkg->depends_count;
-	  newpkg->depends_count = 0;
-
-	  oldpkg->depends = newpkg->depends;
-	  newpkg->depends = NULL;
-
-	  oldpkg->pre_depends_str = newpkg->pre_depends_str;
-	  newpkg->pre_depends_str = NULL;
-	  oldpkg->pre_depends_count = newpkg->pre_depends_count;
-	  newpkg->pre_depends_count = 0;
-
-	  oldpkg->recommends_str = newpkg->recommends_str;
-	  newpkg->recommends_str = NULL;
-	  oldpkg->recommends_count = newpkg->recommends_count;
-	  newpkg->recommends_count = 0;
-
-	  oldpkg->suggests_str = newpkg->suggests_str;
-	  newpkg->suggests_str = NULL;
-	  oldpkg->suggests_count = newpkg->suggests_count;
-	  newpkg->suggests_count = 0;
-     }
-
-     if (!oldpkg->provides_str) {
-	  oldpkg->provides_str = newpkg->provides_str;
-	  newpkg->provides_str = NULL;
-	  oldpkg->provides_count = newpkg->provides_count;
-	  newpkg->provides_count = 0;
-
-	  oldpkg->provides = newpkg->provides;
-	  newpkg->provides = NULL;
-     }
-
-     if (!oldpkg->conflicts_str) {
-	  oldpkg->conflicts_str = newpkg->conflicts_str;
-	  newpkg->conflicts_str = NULL;
-	  oldpkg->conflicts_count = newpkg->conflicts_count;
-	  newpkg->conflicts_count = 0;
-
-	  oldpkg->conflicts = newpkg->conflicts;
-	  newpkg->conflicts = NULL;
-     }
-
-     if (!oldpkg->replaces_str) {
-	  oldpkg->replaces_str = newpkg->replaces_str;
-	  newpkg->replaces_str = NULL;
-	  oldpkg->replaces_count = newpkg->replaces_count;
-	  newpkg->replaces_count = 0;
-
-	  oldpkg->replaces = newpkg->replaces;
-	  newpkg->replaces = NULL;
-     }
-
-     if (!oldpkg->filename)
-	  oldpkg->filename = str_dup_safe(newpkg->filename);
-     if (0)
-     fprintf(stdout, "pkg=%s old local_filename=%s new local_filename=%s\n", 
-	     oldpkg->name, oldpkg->local_filename, newpkg->local_filename);
-     if (!oldpkg->local_filename)
-	  oldpkg->local_filename = str_dup_safe(newpkg->local_filename);
-     if (!oldpkg->tmp_unpack_dir)
-	  oldpkg->tmp_unpack_dir = str_dup_safe(newpkg->tmp_unpack_dir);
-     if (!oldpkg->md5sum)
-	  oldpkg->md5sum = str_dup_safe(newpkg->md5sum);
-     if (!oldpkg->size)
-	  oldpkg->size = str_dup_safe(newpkg->size);
-     if (!oldpkg->installed_size)
-	  oldpkg->installed_size = str_dup_safe(newpkg->installed_size);
-     if (!oldpkg->priority)
-	  oldpkg->priority = str_dup_safe(newpkg->priority);
-     if (!oldpkg->source)
-	  oldpkg->source = str_dup_safe(newpkg->source);
-     if (oldpkg->conffiles.head == NULL){
-	  oldpkg->conffiles = newpkg->conffiles;
-	  conffile_list_init(&newpkg->conffiles);
-     }
-     if (!oldpkg->installed_files){
-	  oldpkg->installed_files = newpkg->installed_files;
-	  oldpkg->installed_files_ref_cnt = newpkg->installed_files_ref_cnt;
-	  newpkg->installed_files = NULL;
-     }
-     if (!oldpkg->essential)
-	  oldpkg->essential = newpkg->essential;
-
-     return 0;
-}
-
-abstract_pkg_t *abstract_pkg_new(void)
-{
-     abstract_pkg_t * ab_pkg;
-
-     ab_pkg = malloc(sizeof(abstract_pkg_t));
-
-     if (ab_pkg == NULL) {
-	  fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	  return NULL;
-     }
-
-     if ( abstract_pkg_init(ab_pkg) < 0 ) 
-        return NULL;
-
-     return ab_pkg;
-}
-
-int abstract_pkg_init(abstract_pkg_t *ab_pkg)
-{
-     memset(ab_pkg, 0, sizeof(abstract_pkg_t));
-
-     ab_pkg->provided_by = abstract_pkg_vec_alloc();
-     if (ab_pkg->provided_by==NULL){
-        return -1;
-     }
-     ab_pkg->dependencies_checked = 0;
-     ab_pkg->state_status = SS_NOT_INSTALLED;
-
-     return 0;
-}
-
-void set_flags_from_control(ipkg_conf_t *conf, pkg_t *pkg){
-     char * temp_str;
-     char **raw =NULL;
-     char **raw_start=NULL; 
-
-     temp_str = (char *) malloc (strlen(pkg->dest->info_dir)+strlen(pkg->name)+12);
-     if (temp_str == NULL ){
-        ipkg_message(conf, IPKG_INFO, "Out of memory in  %s\n", __FUNCTION__);
-        return;
-     }
-     sprintf( temp_str,"%s/%s.control",pkg->dest->info_dir,pkg->name);
-   
-     raw = raw_start = read_raw_pkgs_from_file(temp_str);
-     if (raw == NULL ){
-        ipkg_message(conf, IPKG_ERROR, "Unable to open the control file in  %s\n", __FUNCTION__);
-        return;
-     }
-
-     while(*raw){
-        if (!pkg_valorize_other_field(pkg, &raw ) == 0) {
-            ipkg_message(conf, IPKG_DEBUG, "unable to read control file for %s. May be empty\n", pkg->name);
-        }
-     }
-     raw = raw_start;
-     while (*raw) {
-        if (raw!=NULL)
-          free(*raw++);
-     }
-
-     free(raw_start); 
-     free(temp_str);
-
-     return ;
-
-}
-
-char * pkg_formatted_info(pkg_t *pkg )
-{
-     char *line;
-     char * buff;
-
-     buff = malloc(8192);
-     if (buff == NULL) {
-	  fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	  return NULL;
-     }
-
-     buff[0] = '\0';
-
-     line = pkg_formatted_field(pkg, "Package");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Version");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Depends");
-     strncat(buff ,line, strlen(line));
-     free(line);
-     
-     line = pkg_formatted_field(pkg, "Recommends");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Suggests");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Provides");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Replaces");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Conflicts");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Status");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Section");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Essential"); /* @@@@ should be removed in future release. *//* I do not agree with this Pigi*/
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Architecture");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Maintainer");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "MD5sum");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Size");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Filename");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Conffiles");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Source");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Description");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     line = pkg_formatted_field(pkg, "Installed-Time");
-     strncat(buff ,line, strlen(line));
-     free(line);
-
-     return buff;
-}
-
-char * pkg_formatted_field(pkg_t *pkg, const char *field )
-{
-     static size_t LINE_LEN = 128;
-     char * temp = (char *)malloc(1);
-     int len = 0;
-     int flag_provide_false = 0;
-
-/*
-  Pigi: After some discussion with Florian we decided to modify the full procedure in 
-        dynamic memory allocation. This should avoid any other segv in this area ( except for bugs )
-*/
-
-     if (strlen(field) < PKG_MINIMUM_FIELD_NAME_LEN) {
-	  goto UNKNOWN_FMT_FIELD;
-     }
-
-     temp[0]='\0'; 
-
-     switch (field[0])
-     {
-     case 'a':
-     case 'A':
-	  if (strcasecmp(field, "Architecture") == 0) {
-	       /* Architecture */
-	       if (pkg->architecture) {
-                   temp = (char *)realloc(temp,strlen(pkg->architecture)+17);
-                   if ( temp == NULL ){
-	              fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	              return NULL;
-                   }
-                   temp[0]='\0';
-                   snprintf(temp, (strlen(pkg->architecture)+17), "Architecture: %s\n", pkg->architecture);
-	       }
-	  } else {
-	       goto UNKNOWN_FMT_FIELD;
-	  }
-	  break;
-     case 'c':
-     case 'C':
-	  if (strcasecmp(field, "Conffiles") == 0) {
-	       /* Conffiles */
-	       conffile_list_elt_t *iter;
-               char confstr[LINE_LEN];
-
-	       if (pkg->conffiles.head == NULL) {
-		    return temp;
-	       }
-
-               len = 14 ;
-	       for (iter = pkg->conffiles.head; iter; iter = iter->next) {
-		    if (iter->data->name && iter->data->value) {
-                       len = len + (strlen(iter->data->name)+strlen(iter->data->value)+5);
-		    }
-	       }
-               temp = (char *)realloc(temp,len);
-               if ( temp == NULL ){
-	          fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	          return NULL;
-               }
-               temp[0]='\0';
-               strncpy(temp, "Conffiles:\n", 12);
-	       for (iter = pkg->conffiles.head; iter; iter = iter->next) {
-		    if (iter->data->name && iter->data->value) {
-                         snprintf(confstr, LINE_LEN, "%s %s\n", iter->data->name, iter->data->value);
-                         strncat(temp, confstr, strlen(confstr));           
-		    }
-	       }
-	  } else if (strcasecmp(field, "Conflicts") == 0) {
-	       int i;
-
-	       if (pkg->conflicts_count) {
-                    char conflictstr[LINE_LEN];
-                    len = 14 ;
-		    for(i = 0; i < pkg->conflicts_count; i++) {
-                        len = len + (strlen(pkg->conflicts_str[i])+5);
-                    }
-                    temp = (char *)realloc(temp,len);
-                    if ( temp == NULL ){
-	               fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	               return NULL;
-                    }
-                    temp[0]='\0';
-                    strncpy(temp, "Conflicts:", 11);
-		    for(i = 0; i < pkg->conflicts_count; i++) {
-                        snprintf(conflictstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->conflicts_str[i]);
-                        strncat(temp, conflictstr, strlen(conflictstr));           
-                    }
-                    strncat(temp, "\n", strlen("\n")); 
-	       }
-	  } else {
-	       goto UNKNOWN_FMT_FIELD;
-	  }
-	  break;
-     case 'd':
-     case 'D':
-	  if (strcasecmp(field, "Depends") == 0) {
-	       /* Depends */
-	       int i;
-
-	       if (pkg->depends_count) {
-                    char depstr[LINE_LEN];
-                    len = 14 ;
-		    for(i = 0; i < pkg->depends_count; i++) {
-                        len = len + (strlen(pkg->depends_str[i])+4);
-                    }
-                    temp = (char *)realloc(temp,len);
-                    if ( temp == NULL ){
-	               fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	               return NULL;
-                    }
-                    temp[0]='\0';
-                    strncpy(temp, "Depends:", 10);
-		    for(i = 0; i < pkg->depends_count; i++) {
-                        snprintf(depstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->depends_str[i]);
-                        strncat(temp, depstr, strlen(depstr));           
-                    }
-                    strncat(temp, "\n", strlen("\n")); 
-	       }
-	  } else if (strcasecmp(field, "Description") == 0) {
-	       /* Description */
-	       if (pkg->description) {
-                   temp = (char *)realloc(temp,strlen(pkg->description)+16);
-                   if ( temp == NULL ){
-	              fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	              return NULL;
-                   }
-                   temp[0]='\0';
-                   snprintf(temp, (strlen(pkg->description)+16), "Description: %s\n", pkg->description);
-	       }
-	  } else {
-	       goto UNKNOWN_FMT_FIELD;
-	  }
-      break;
-     case 'e':
-     case 'E': {
-	  /* Essential */
-	  if (pkg->essential) {
-              temp = (char *)realloc(temp,16);
-              if ( temp == NULL ){
-	         fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	         return NULL;
-              }
-              temp[0]='\0';
-              snprintf(temp, (16), "Essential: yes\n");
-	  }
-     }
-	  break;
-     case 'f':
-     case 'F': {
-	  /* Filename */
-	  if (pkg->filename) {
-              temp = (char *)realloc(temp,strlen(pkg->filename)+12);
-              if ( temp == NULL ){
-	          fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	          return NULL;
-              }
-              temp[0]='\0';
-              snprintf(temp, (strlen(pkg->filename)+12), "Filename: %s\n", pkg->filename);
-	  }
-     }
-	  break;
-     case 'i':
-     case 'I': {
-	  if (strcasecmp(field, "Installed-Size") == 0) {
-	       /* Installed-Size */
-               temp = (char *)realloc(temp,strlen(pkg->installed_size)+17);
-               if ( temp == NULL ){
-	           fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	           return NULL;
-               }
-               temp[0]='\0';
-               snprintf(temp, (strlen(pkg->installed_size)+17), "Installed-Size: %s\n", pkg->installed_size);
-	  } else if (strcasecmp(field, "Installed-Time") == 0 && pkg->installed_time) {
-               temp = (char *)realloc(temp,29);
-               if ( temp == NULL ){
-	          fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	          return NULL;
-               }
-               temp[0]='\0';
-               snprintf(temp, 29, "Installed-Time: %lu\n", pkg->installed_time);
-	  }
-     }
-	  break;
-     case 'm':
-     case 'M': {
-	  /* Maintainer | MD5sum */
-	  if (strcasecmp(field, "Maintainer") == 0) {
-	       /* Maintainer */
-	       if (pkg->maintainer) {
-                   temp = (char *)realloc(temp,strlen(pkg->maintainer)+14);
-                   if ( temp == NULL ){
-	              fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	              return NULL;
-                   }
-                   temp[0]='\0';
-                   snprintf(temp, (strlen(pkg->maintainer)+14), "maintainer: %s\n", pkg->maintainer);
-	       }
-	  } else if (strcasecmp(field, "MD5sum") == 0) {
-	       /* MD5sum */
-	       if (pkg->md5sum) {
-                   temp = (char *)realloc(temp,strlen(pkg->md5sum)+11);
-                   if ( temp == NULL ){
-	              fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	              return NULL;
-                   }
-                   temp[0]='\0';
-                   snprintf(temp, (strlen(pkg->md5sum)+11), "MD5Sum: %s\n", pkg->md5sum);
-	       }
-	  } else {
-	       goto UNKNOWN_FMT_FIELD;
-	  }
-     }
-	  break;
-     case 'p':
-     case 'P': {
-	  if (strcasecmp(field, "Package") == 0) {
-	       /* Package */
-               temp = (char *)realloc(temp,strlen(pkg->name)+11);
-               if ( temp == NULL ){
-	          fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	          return NULL;
-               }
-               temp[0]='\0';
-               snprintf(temp, (strlen(pkg->name)+11), "Package: %s\n", pkg->name);
-	  } else if (strcasecmp(field, "Priority") == 0) {
-	       /* Priority */
-               temp = (char *)realloc(temp,strlen(pkg->priority)+12);
-               if ( temp == NULL ){
-	          fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	          return NULL;
-               }
-               temp[0]='\0';
-               snprintf(temp, (strlen(pkg->priority)+12), "Priority: %s\n", pkg->priority);
-	  } else if (strcasecmp(field, "Provides") == 0) {
-	       /* Provides */
-	       int i;
-
-	       if (pkg->provides_count) {
-               /* Here we check if the ipkg_internal_use_only is used, and we discard it.*/
-                  for ( i=0; i < pkg->provides_count; i++ ){
-	              if (strstr(pkg->provides_str[i],"ipkg_internal_use_only")!=NULL) {
-                         memset (pkg->provides_str[i],'\x0',strlen(pkg->provides_str[i])); /* Pigi clear my trick flag, just in case */
-                         flag_provide_false = 1;
-                      }
-                  }
-                  if ( !flag_provide_false ||                                             /* Pigi there is not my trick flag */
-                     ((flag_provide_false) &&  (pkg->provides_count > 1))){             /* Pigi There is, but we also have others Provides */
-                     char provstr[LINE_LEN];
-                     len = 15;
-		     for(i = 0; i < pkg->provides_count; i++) {
-                         len = len + (strlen(pkg->provides_str[i])+5);
-                     }
-                     temp = (char *)realloc(temp,len);
-                     if ( temp == NULL ){
-	                fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	                return NULL;
-                     }
-                     temp[0]='\0';
-                     strncpy(temp, "Provides:", 12);
-		     for(i = 0; i < pkg->provides_count; i++) {
-                         if (strlen(pkg->provides_str[i])>0){;
-                            snprintf(provstr, LINE_LEN, "%s %s", i == 1 ? "" : ",", pkg->provides_str[i]);
-                            strncat(temp, provstr, strlen(provstr));           
-                         }
-                     }
-                     strncat(temp, "\n", strlen("\n")); 
-                  }
-               }
-	  } else {
-	       goto UNKNOWN_FMT_FIELD;
-	  }
-     }
-	  break;
-     case 'r':
-     case 'R': {
-	  int i;
-	  /* Replaces | Recommends*/
-	  if (strcasecmp (field, "Replaces") == 0) {
-	       if (pkg->replaces_count) {
-                    char replstr[LINE_LEN];
-                    len = 14;
-		    for (i = 0; i < pkg->replaces_count; i++) {
-                        len = len + (strlen(pkg->replaces_str[i])+5);
-                    }
-                    temp = (char *)realloc(temp,len);
-                    if ( temp == NULL ){
-	               fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	               return NULL;
-                    }
-                    temp[0]='\0';
-                    strncpy(temp, "Replaces:", 12);
-		    for (i = 0; i < pkg->replaces_count; i++) {
-                        snprintf(replstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->replaces_str[i]);
-                        strncat(temp, replstr, strlen(replstr));           
-                    }
-                    strncat(temp, "\n", strlen("\n")); 
-	       }
-	  } else if (strcasecmp (field, "Recommends") == 0) {
-	       if (pkg->recommends_count) {
-                    char recstr[LINE_LEN];
-                    len = 15;
-		    for(i = 0; i < pkg->recommends_count; i++) {
-                         len = len + (strlen( pkg->recommends_str[i])+5);
-                    }
-                    temp = (char *)realloc(temp,len);
-                   if ( temp == NULL ){
-	              fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	              return NULL;
-                   }
-                    temp[0]='\0';
-                    strncpy(temp, "Recommends:", 13);
-		    for(i = 0; i < pkg->recommends_count; i++) {
-                        snprintf(recstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->recommends_str[i]);
-                        strncat(temp, recstr, strlen(recstr));           
-                    }
-                    strncat(temp, "\n", strlen("\n")); 
-	       }
-	  } else {
-	       goto UNKNOWN_FMT_FIELD;
-	  }
-     }
-	  break;
-     case 's':
-     case 'S': {
-	  /* Section | Size | Source | Status | Suggests */
-	  if (strcasecmp(field, "Section") == 0) {
-	       /* Section */
-	       if (pkg->section) {
-                   temp = (char *)realloc(temp,strlen(pkg->section)+11);
-                   if ( temp == NULL ){
-	              fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	              return NULL;
-                   }
-                   temp[0]='\0';
-                   snprintf(temp, (strlen(pkg->section)+11), "Section: %s\n", pkg->section);
-	       }
-	  } else if (strcasecmp(field, "Size") == 0) {
-	       /* Size */
-	       if (pkg->size) {
-                   temp = (char *)realloc(temp,strlen(pkg->size)+8);
-                   if ( temp == NULL ){
-	              fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	              return NULL;
-                   }
-                   temp[0]='\0';
-                   snprintf(temp, (strlen(pkg->size)+8), "Size: %s\n", pkg->size);
-	       }
-	  } else if (strcasecmp(field, "Source") == 0) {
-	       /* Source */
-	       if (pkg->source) {
-                   temp = (char *)realloc(temp,strlen(pkg->source)+10);
-                   if ( temp == NULL ){
-	              fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	              return NULL;
-                   }
-                   temp[0]='\0';
-                   snprintf(temp, (strlen(pkg->source)+10), "Source: %s\n", pkg->source);
-               }
-	  } else if (strcasecmp(field, "Status") == 0) {
-	       /* Status */
-               /* Benjamin Pineau note: we should avoid direct usage of 
-                * strlen(arg) without keeping "arg" for later free()
-                */
-               char *pflag=pkg_state_flag_to_str(pkg->state_flag);
-               char *pstat=pkg_state_status_to_str(pkg->state_status);
-               char *pwant=pkg_state_want_to_str(pkg->state_want);
-
-               size_t sum_of_sizes = (size_t) ( strlen(pwant)+ strlen(pflag)+ strlen(pstat) + 12 );
-               temp = (char *)realloc(temp,sum_of_sizes);
-               if ( temp == NULL ){
-                   fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-                   return NULL;
-                }
-                temp[0]='\0';
-                snprintf(temp, sum_of_sizes , "Status: %s %s %s\n", pwant, pflag, pstat);
-                free(pflag);
-                free(pwant);
-               if(pstat) /* pfstat can be NULL if ENOMEM */
-                   free(pstat);
-	  } else if (strcasecmp(field, "Suggests") == 0) {
-	       if (pkg->suggests_count) {
-		    int i;
-                    char sugstr[LINE_LEN];
-                    len = 13;
-		    for(i = 0; i < pkg->suggests_count; i++) {
-                        len = len + (strlen(pkg->suggests_str[i])+5);
-                    }
-                    temp = (char *)realloc(temp,len);
-                    if ( temp == NULL ){
-	               fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	               return NULL;
-                    }
-                    temp[0]='\0';
-                    strncpy(temp, "Suggests:", 10);
-		    for(i = 0; i < pkg->suggests_count; i++) {
-                        snprintf(sugstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->suggests_str[i]);
-                        strncat(temp, sugstr, strlen(sugstr));           
-                    }
-                    strncat(temp, "\n", strlen("\n")); 
-	       }
-	  } else {
-	       goto UNKNOWN_FMT_FIELD;
-	  }
-     }
-	  break;
-     case 'v':
-     case 'V': {
-	  /* Version */
-	  char *version = pkg_version_str_alloc(pkg);
-          temp = (char *)realloc(temp,strlen(version)+14);
-          if ( temp == NULL ){
-	      fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	      return NULL;
-          }
-          temp[0]='\0';
-          snprintf(temp, (strlen(version)+12), "Version: %s\n", version);
-	  free(version);
-     }
-	  break;
-     default:
-	  goto UNKNOWN_FMT_FIELD;
-     }
-
-     if ( strlen(temp)<2 ) {
-          temp[0]='\0';
-     }
-     return temp;
-
- UNKNOWN_FMT_FIELD:
-     fprintf(stderr, "%s: ERROR: Unknown field name: %s\n", __FUNCTION__, field);
-     if ( strlen(temp)<2 ) {
-          temp[0]='\0';
-     }
-
-     return temp;
-}
-
-void pkg_print_info(pkg_t *pkg, FILE *file)
-{
-     char * buff;
-     if (pkg == NULL) {
-	return;
-     }
-
-     buff = pkg_formatted_info(pkg);
-     if ( buff == NULL ) 
-         return;
-     if (strlen(buff)>2){
-         fwrite(buff, 1, strlen(buff), file);
-     } 
-     free(buff);
-}
-
-void pkg_print_status(pkg_t * pkg, FILE * file)
-{
-     if (pkg == NULL) {
-	  return;
-     }
-
-     /* XXX: QUESTION: Do we actually want more fields here? The
-	original idea was to save space by installing only what was
-	needed for actual computation, (package, version, status,
-	essential, conffiles). The assumption is that all other fields
-	can be found in th available file.
-
-	But, someone proposed the idea to make it possible to
-	reconstruct a .ipk from an installed package, (ie. for beaming
-	from one handheld to another). So, maybe we actually want a few
-	more fields here, (depends, suggests, etc.), so that that would
-	be guaranteed to work even in the absence of more information
-	from the available file.
-
-	28-MAR-03: kergoth and I discussed this yesterday.  We think
-	the essential info needs to be here for all installed packages
-	because they may not appear in the Packages files on various
-	feeds.  Furthermore, one should be able to install from URL or
-	local storage without requiring a Packages file from any feed.
-	-Jamey
-     */
-     pkg_print_field(pkg, file, "Package");
-     pkg_print_field(pkg, file, "Version");
-     pkg_print_field(pkg, file, "Depends");
-     pkg_print_field(pkg, file, "Recommends");
-     pkg_print_field(pkg, file, "Suggests");
-     pkg_print_field(pkg, file, "Provides");
-     pkg_print_field(pkg, file, "Replaces");
-     pkg_print_field(pkg, file, "Conflicts");
-     pkg_print_field(pkg, file, "Status");
-     pkg_print_field(pkg, file, "Essential"); /* @@@@ should be removed in future release. */
-     pkg_print_field(pkg, file, "Architecture");
-     pkg_print_field(pkg, file, "Conffiles");
-     pkg_print_field(pkg, file, "Installed-Time");
-     fputs("\n", file);
-}
-
-void pkg_print_field(pkg_t *pkg, FILE *file, const char *field)
-{
-     char *buff;
-     if (strlen(field) < PKG_MINIMUM_FIELD_NAME_LEN) {
-       fprintf(stderr, "%s: ERROR: Unknown field name: %s\n",
-	     __FUNCTION__, field);
-     }
-     buff = pkg_formatted_field(pkg, field);
-     if (strlen(buff)>2) {
-       fprintf(file, "%s", buff);
-       fflush(file);
-     }
-     free(buff);
-     return;
-}
-
-/*
- * libdpkg - Debian packaging suite library routines
- * vercmp.c - comparison of version numbers
- *
- * Copyright (C) 1995 Ian Jackson <iwj10 at cus.cam.ac.uk>
- */
-int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg)
-{
-     int r;
-
-     if (pkg->epoch > ref_pkg->epoch) {
-	  return 1;
-     }
-
-     if (pkg->epoch < ref_pkg->epoch) {
-	  return -1;
-     }
-
-     r = verrevcmp(pkg->version, ref_pkg->version);
-     if (r) {
-	  return r;
-     }
-
-#ifdef USE_DEBVERSION
-     r = verrevcmp(pkg->revision, ref_pkg->revision);
-     if (r) {
-	  return r;
-     }
-
-     r = verrevcmp(pkg->familiar_revision, ref_pkg->familiar_revision);
-#endif
-
-     return r;
-}
-
-int verrevcmp(const char *val, const char *ref)
-{
-     int vc, rc;
-     long vl, rl;
-     const char *vp, *rp;
-     const char *vsep, *rsep;
-    
-     if (!val) val= "";
-     if (!ref) ref= "";
-     for (;;) {
-	  vp= val;  while (*vp && !isdigit(*vp)) vp++;
-	  rp= ref;  while (*rp && !isdigit(*rp)) rp++;
-	  for (;;) {
-	       vc= (val == vp) ? 0 : *val++;
-	       rc= (ref == rp) ? 0 : *ref++;
-	       if (!rc && !vc) break;
-	       if (vc && !isalpha(vc)) vc += 256; /* assumes ASCII character set */
-	       if (rc && !isalpha(rc)) rc += 256;
-	       if (vc != rc) return vc - rc;
-	  }
-	  val= vp;
-	  ref= rp;
-	  vl=0;  if (isdigit(*vp)) vl= strtol(val,(char**)&val,10);
-	  rl=0;  if (isdigit(*rp)) rl= strtol(ref,(char**)&ref,10);
-	  if (vl != rl) return vl - rl;
-
-	  vc = *val;
-	  rc = *ref;
-	  vsep = strchr(".-", vc);
-	  rsep = strchr(".-", rc);
-	  if (vsep && !rsep) return -1;
-	  if (!vsep && rsep) return +1;
-
-	  if (!*val && !*ref) return 0;
-	  if (!*val) return -1;
-	  if (!*ref) return +1;
-     }
-}
-
-int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op)
-{
-     int r;
-
-     r = pkg_compare_versions(it, ref);
-
-     if (strcmp(op, "<=") == 0 || strcmp(op, "<") == 0) {
-	  return r <= 0;
-     }
-
-     if (strcmp(op, ">=") == 0 || strcmp(op, ">") == 0) {
-	  return r >= 0;
-     }
-
-     if (strcmp(op, "<<") == 0) {
-	  return r < 0;
-     }
-
-     if (strcmp(op, ">>") == 0) {
-	  return r > 0;
-     }
-
-     if (strcmp(op, "=") == 0) {
-	  return r == 0;
-     }
-
-     fprintf(stderr, "unknown operator: %s", op);
-     return 0;
-}
-
-int pkg_name_version_and_architecture_compare(void *p1, void *p2)
-{
-     const pkg_t *a = *(const pkg_t **)p1;
-     const pkg_t *b = *(const pkg_t **)p2;
-     int namecmp;
-     int vercmp;
-     if (!a->name || !b->name) {
-       fprintf(stderr, "pkg_name_version_and_architecture_compare: a=%p a->name=%p b=%p b->name=%p\n",
-	       a, a->name, b, b->name);
-       return 0;
-     }
-       
-     namecmp = strcmp(a->name, b->name);
-     if (namecmp)
-	  return namecmp;
-     vercmp = pkg_compare_versions(a, b);
-     if (vercmp)
-	  return vercmp;
-     if (!a->arch_priority || !b->arch_priority) {
-       fprintf(stderr, "pkg_name_version_and_architecture_compare: a=%p a->arch_priority=%i b=%p b->arch_priority=%i\n",
-	       a, a->arch_priority, b, b->arch_priority);
-       return 0;
-     }
-     if (a->arch_priority > b->arch_priority)
-	  return 1;
-     if (a->arch_priority < b->arch_priority)
-	  return -1;
-     return 0;
-}
-
-int abstract_pkg_name_compare(void *p1, void *p2)
-{
-     const abstract_pkg_t *a = *(const abstract_pkg_t **)p1;
-     const abstract_pkg_t *b = *(const abstract_pkg_t **)p2;
-     if (!a->name || !b->name) {
-       fprintf(stderr, "abstract_pkg_name_compare: a=%p a->name=%p b=%p b->name=%p\n",
-	       a, a->name, b, b->name);
-       return 0;
-     }
-     return strcmp(a->name, b->name);
-}
-
-
-char *pkg_version_str_alloc(pkg_t *pkg)
-{
-     char *complete_version;
-     char *epoch_str;
-#ifdef USE_DEBVERSION
-     char *revision_str;
-     char *familiar_revision_str;
-#endif
-
-     if (pkg->epoch) {
-	  sprintf_alloc(&epoch_str, "%d:", pkg->epoch);
-     } else {
-	  epoch_str = strdup("");
-     }
-
-#ifdef USE_DEBVERSION
-     if (pkg->revision && strlen(pkg->revision)) {
-	  sprintf_alloc(&revision_str, "-%s", pkg->revision);
-     } else {
-	  revision_str = strdup("");
-     }
-
-     if (pkg->familiar_revision && strlen(pkg->familiar_revision)) {
-	  sprintf_alloc(&familiar_revision_str, "-fam%s", pkg->familiar_revision);
-     } else {
-	  familiar_revision_str = strdup("");
-     }
-#endif
-
-#ifdef USE_DEBVERSION
-     sprintf_alloc(&complete_version, "%s%s%s%s",
-		   epoch_str, pkg->version, revision_str, familiar_revision_str);
-#else
-     sprintf_alloc(&complete_version, "%s%s",
-		   epoch_str, pkg->version);
-#endif
-
-     free(epoch_str);
-#ifdef USE_DEBVERSION
-     free(revision_str);
-     free(familiar_revision_str);
-#endif
-
-     return complete_version;
-}
-
-str_list_t *pkg_get_installed_files(pkg_t *pkg)
-{
-     int err;
-     char *list_file_name = NULL;
-     FILE *list_file = NULL;
-     char *line;
-     char *installed_file_name;
-     int rootdirlen;
-
-     pkg->installed_files_ref_cnt++;
-
-     if (pkg->installed_files) {
-	  return pkg->installed_files;
-     }
-
-     pkg->installed_files = str_list_alloc();
-     if (pkg->installed_files == NULL) {
-	  fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	  return NULL;
-     }
-
-     /* For uninstalled packages, get the file list firectly from the package.
-	For installed packages, look at the package.list file in the database.
-     */
-     if (pkg->state_status == SS_NOT_INSTALLED || pkg->dest == NULL) {
-	  if (pkg->local_filename == NULL) {
-	       return pkg->installed_files;
-	  }
-	  /* XXX: CLEANUP: Maybe rewrite this to avoid using a temporary
-	     file. In other words, change deb_extract so that it can
-	     simply return the file list as a char *[] rather than
-	     insisting on writing in to a FILE * as it does now. */
-	  list_file = tmpfile();
-	  err = pkg_extract_data_file_names_to_stream(pkg, list_file);
-	  if (err) {
-	       fclose(list_file);
-	       fprintf(stderr, "%s: Error extracting file list from %s: %s\n",
-		       __FUNCTION__, pkg->local_filename, strerror(err));
-	       return pkg->installed_files;
-	  }
-	  rewind(list_file);
-     } else {
-	  sprintf_alloc(&list_file_name, "%s/%s.list",
-			pkg->dest->info_dir, pkg->name);
-	  if (! file_exists(list_file_name)) {
-	       free(list_file_name);
-	       return pkg->installed_files;
-	  }
-
-	  list_file = fopen(list_file_name, "r");
-	  if (list_file == NULL) {
-	       fprintf(stderr, "WARNING: Cannot open %s: %s\n",
-		       list_file_name, strerror(errno));
-	       free(list_file_name);
-	       return pkg->installed_files;
-	  }
-	  free(list_file_name);
-     }
-
-     rootdirlen = strlen( pkg->dest->root_dir );
-     while (1) {
-	  char *file_name;
-	
-	  line = file_read_line_alloc(list_file);
-	  if (line == NULL) {
-	       break;
-	  }
-	  str_chomp(line);
-	  file_name = line;
-
-	  /* Take pains to avoid uglies like "/./" in the middle of file_name. */
-	  if( strncmp( pkg->dest->root_dir, 
-		       file_name, 
-		       rootdirlen ) ) {
-	       if (*file_name == '.') {
-		    file_name++;
-	       }
-	       if (*file_name == '/') {
-		    file_name++;
-	       }
-
-	       /* Freed in pkg_free_installed_files */
-	       sprintf_alloc(&installed_file_name, "%s%s", pkg->dest->root_dir, file_name);
-	  } else {
-	       // already contains root_dir as header -> ABSOLUTE
-	       sprintf_alloc(&installed_file_name, "%s", file_name);
-	  }
-	  str_list_append(pkg->installed_files, installed_file_name);
-	  free(line);
-     }
-
-     fclose(list_file);
-
-     return pkg->installed_files;
-}
-
-/* XXX: CLEANUP: This function and it's counterpart,
-   (pkg_get_installed_files), do not match our init/deinit naming
-   convention. Nor the alloc/free convention. But, then again, neither
-   of these conventions currrently fit the way these two functions
-   work. */
-int pkg_free_installed_files(pkg_t *pkg)
-{
-     str_list_elt_t *iter;
-
-     pkg->installed_files_ref_cnt--;
-     if (pkg->installed_files_ref_cnt > 0) {
-	  return 0;
-     }
-
-     if (pkg->installed_files) {
-
-	  for (iter = pkg->installed_files->head; iter; iter = iter->next) {
-	       /* malloced in pkg_get_installed_files */
-	       free (iter->data);
-	       iter->data = NULL;
-	  }
-
-	  str_list_deinit(pkg->installed_files);
-     }
-
-     pkg->installed_files = NULL;
-
-     return 0;
-}
-
-int pkg_remove_installed_files_list(ipkg_conf_t *conf, pkg_t *pkg)
-{
-     int err;
-     char *list_file_name;
-
-     //I don't think pkg_free_installed_files should be called here. Jamey
-     //pkg_free_installed_files(pkg);
-
-     sprintf_alloc(&list_file_name, "%s/%s.list",
-		   pkg->dest->info_dir, pkg->name);
-     if (!conf->noaction) {
-	  err = unlink(list_file_name);
-	  free(list_file_name);
-
-	  if (err) {
-	       return errno;
-	  }
-     }
-     return 0;
-}
-
-conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name)
-{
-     conffile_list_elt_t *iter;
-     conffile_t *conffile;
-
-     if (pkg == NULL) {
-	  return NULL;
-     }
-
-     for (iter = pkg->conffiles.head; iter; iter = iter->next) {
-	  conffile = iter->data;
-
-	  if (strcmp(conffile->name, file_name) == 0) {
-	       return conffile;
-	  }
-     }
-
-     return NULL;
-}
-
-int pkg_run_script(ipkg_conf_t *conf, pkg_t *pkg,
-		   const char *script, const char *args)
-{
-     int err;
-     char *path;
-     char *cmd;
-
-     /* XXX: FEATURE: When conf->offline_root is set, we should run the
-	maintainer script within a chroot environment. */
-
-     /* Installed packages have scripts in pkg->dest->info_dir, uninstalled packages
-	have scripts in pkg->tmp_unpack_dir. */
-     if (pkg->state_status == SS_INSTALLED || pkg->state_status == SS_UNPACKED) {
-	  if (pkg->dest == NULL) {
-	       fprintf(stderr, "%s: ERROR: installed package %s has a NULL dest\n",
-		       __FUNCTION__, pkg->name);
-	       return EINVAL;
-	  }
-	  sprintf_alloc(&path, "%s/%s.%s", pkg->dest->info_dir, pkg->name, script);
-     } else {
-	  if (pkg->tmp_unpack_dir == NULL) {
-	       fprintf(stderr, "%s: ERROR: uninstalled package %s has a NULL tmp_unpack_dir\n",
-		       __FUNCTION__, pkg->name);
-	       return EINVAL;
-	  }
-	  sprintf_alloc(&path, "%s/%s", pkg->tmp_unpack_dir, script);
-     }
-
-     ipkg_message(conf, IPKG_INFO, "Running script %s\n", path);
-     if (conf->noaction) return 0;
-
-     /* XXX: CLEANUP: There must be a better way to handle maintainer
-	scripts when running with offline_root mode and/or a dest other
-	than '/'. I've been playing around with some clever chroot
-	tricks and I might come up with something workable. */
-     if (conf->offline_root) {
-	  setenv("IPKG_OFFLINE_ROOT", conf->offline_root, 1);
-     }
-
-     setenv("PKG_ROOT",
-	    pkg->dest ? pkg->dest->root_dir : conf->default_dest->root_dir, 1);
-
-     if (! file_exists(path)) {
-	  free(path);
-	  return 0;
-     }
-
-     if (conf->offline_root) {
-	  fprintf(stderr, "(offline root mode: not running %s.%s)\n", pkg->name, script);
-	  free(path);
-	  return 0;
-     }
-
-     sprintf_alloc(&cmd, "%s %s", path, args);
-     free(path);
-
-     err = xsystem(cmd);
-     free(cmd);
-
-     if (err) {
-	  fprintf(stderr, "%s script returned status %d\n", script, err);
-	  return err;
-     }
-
-     return 0;
-}
-
-char *pkg_state_want_to_str(pkg_state_want_t sw)
-{
-     int i;
-
-     for (i=0; i < ARRAY_SIZE(pkg_state_want_map); i++) {
-	  if (pkg_state_want_map[i].value == sw) {
-	       return strdup(pkg_state_want_map[i].str);
-	  }
-     }
-
-     fprintf(stderr, "%s: ERROR: Illegal value for state_want: %d\n",
-	     __FUNCTION__, sw);
-     return strdup("<STATE_WANT_UNKNOWN>");
-}
-
-pkg_state_want_t pkg_state_want_from_str(char *str)
-{
-     int i;
-
-     for (i=0; i < ARRAY_SIZE(pkg_state_want_map); i++) {
-	  if (strcmp(str, pkg_state_want_map[i].str) == 0) {
-	       return pkg_state_want_map[i].value;
-	  }
-     }
-
-     fprintf(stderr, "%s: ERROR: Illegal value for state_want string: %s\n",
-	     __FUNCTION__, str);
-     return SW_UNKNOWN;
-}
-
-char *pkg_state_flag_to_str(pkg_state_flag_t sf)
-{
-     int i;
-     int len = 3; /* ok\000 is minimum */
-     char *str = NULL;
-
-     /* clear the temporary flags before converting to string */
-     sf &= SF_NONVOLATILE_FLAGS;
-
-     if (sf == 0) {
-	  return strdup("ok");
-     } else {
-
-	  for (i=0; i < ARRAY_SIZE(pkg_state_flag_map); i++) {
-	       if (sf & pkg_state_flag_map[i].value) {
-		    len += strlen(pkg_state_flag_map[i].str) + 1;
-	       }
-	  }
-	  str = malloc(len);
-          if ( str == NULL ) {
-	      fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-              return NULL;
-          }
-	  str[0] = 0;
-	  for (i=0; i < ARRAY_SIZE(pkg_state_flag_map); i++) {
-	       if (sf & pkg_state_flag_map[i].value) {
-		    strcat(str, pkg_state_flag_map[i].str);
-		    strcat(str, ",");
-	       }
-	  }
-	  len = strlen(str);
-	  str[len-1] = 0; /* squash last comma */
-	  return str;
-     }
-}
-
-pkg_state_flag_t pkg_state_flag_from_str(char *str)
-{
-     int i;
-     int sf = SF_OK;
-
-     if (strcmp(str, "ok") == 0) {
-	  return SF_OK;
-     }
-     for (i=0; i < ARRAY_SIZE(pkg_state_flag_map); i++) {
-	  const char *sfname = pkg_state_flag_map[i].str;
-	  int sfname_len = strlen(sfname);
-	  if (strncmp(str, sfname, sfname_len) == 0) {
-	       sf |= pkg_state_flag_map[i].value;
-	       str += sfname_len;
-	       if (str[0] == ',') {
-		    str++;
-	       } else {
-		    break;
-	       }
-	  }
-     }
-
-     return sf;
-}
-
-char *pkg_state_status_to_str(pkg_state_status_t ss)
-{
-     int i;
-
-     for (i=0; i < ARRAY_SIZE(pkg_state_status_map); i++) {
-	  if (pkg_state_status_map[i].value == ss) {
-	       return strdup(pkg_state_status_map[i].str);
-	  }
-     }
-
-     fprintf(stderr, "%s: ERROR: Illegal value for state_status: %d\n",
-	     __FUNCTION__, ss);
-     return strdup("<STATE_STATUS_UNKNOWN>");
-}
-
-pkg_state_status_t pkg_state_status_from_str(char *str)
-{
-     int i;
-
-     for (i=0; i < ARRAY_SIZE(pkg_state_status_map); i++) {
-	  if (strcmp(str, pkg_state_status_map[i].str) == 0) {
-	       return pkg_state_status_map[i].value;
-	  }
-     }
-
-     fprintf(stderr, "%s: ERROR: Illegal value for state_status string: %s\n",
-	     __FUNCTION__, str);
-     return SS_NOT_INSTALLED;
-}
-
-int pkg_arch_supported(ipkg_conf_t *conf, pkg_t *pkg)
-{
-     nv_pair_list_elt_t *l;
-
-     if (!pkg->architecture)
-	  return 1;
-
-     l = conf->arch_list.head;
-
-     while (l) {
-	  nv_pair_t *nv = l->data;
-	  if (strcmp(nv->name, pkg->architecture) == 0) {
-	       ipkg_message(conf, IPKG_DEBUG, "arch %s (priority %s) supported for pkg %s\n", nv->name, nv->value, pkg->name);
-	       return 1;
-	  }
-	  l = l->next;
-     }
-
-     ipkg_message(conf, IPKG_DEBUG, "arch %s unsupported for pkg %s\n", pkg->architecture, pkg->name);
-     return 0;
-}
-
-int pkg_get_arch_priority(ipkg_conf_t *conf, const char *archname)
-{
-     nv_pair_list_elt_t *l;
-
-     l = conf->arch_list.head;
-
-     while (l) {
-	  nv_pair_t *nv = l->data;
-	  if (strcmp(nv->name, archname) == 0) {
-	       int priority = strtol(nv->value, NULL, 0);
-	       return priority;
-	  }
-	  l = l->next;
-     }
-     return 0;
-}
-
-int pkg_info_preinstall_check(ipkg_conf_t *conf)
-{
-     int i;
-     hash_table_t *pkg_hash = &conf->pkg_hash;
-     pkg_vec_t *available_pkgs = pkg_vec_alloc();
-     pkg_vec_t *installed_pkgs = pkg_vec_alloc();
-
-     ipkg_message(conf, IPKG_INFO, "pkg_info_preinstall_check: updating arch priority for each package\n");
-     pkg_hash_fetch_available(pkg_hash, available_pkgs);
-     /* update arch_priority for each package */
-     for (i = 0; i < available_pkgs->len; i++) {
-	  pkg_t *pkg = available_pkgs->pkgs[i];
-	  int arch_priority = 1;
-	  if (!pkg)
-	       continue;
-	  // ipkg_message(conf, IPKG_DEBUG2, " package %s version=%s arch=%p:", pkg->name, pkg->version, pkg->architecture);
-	  if (pkg->architecture) 
-	       arch_priority = pkg_get_arch_priority(conf, pkg->architecture);
-	  else 
-	       ipkg_message(conf, IPKG_ERROR, "pkg_info_preinstall_check: no architecture for package %s\n", pkg->name);
-	  // ipkg_message(conf, IPKG_DEBUG2, "%s arch_priority=%d\n", pkg->architecture, arch_priority);
-	  pkg->arch_priority = arch_priority;
-     }
-
-     for (i = 0; i < available_pkgs->len; i++) {
-	  pkg_t *pkg = available_pkgs->pkgs[i];
-	  if (!pkg->arch_priority && (pkg->state_flag || (pkg->state_want != SW_UNKNOWN))) {
-	       /* clear flags and want for any uninstallable package */
-	       ipkg_message(conf, IPKG_NOTICE, "Clearing state_want and state_flag for pkg=%s (arch_priority=%d flag=%d want=%d)\n", 
-			    pkg->name, pkg->arch_priority, pkg->state_flag, pkg->state_want);
-	       pkg->state_want = SW_UNKNOWN;
-	       pkg->state_flag = 0;
-	  }
-     }
-     pkg_vec_free(available_pkgs);
-
-     /* update the file owner data structure */
-     ipkg_message(conf, IPKG_INFO, "pkg_info_preinstall_check: update file owner list\n");
-     pkg_hash_fetch_all_installed(pkg_hash, installed_pkgs);
-     for (i = 0; i < installed_pkgs->len; i++) {
-	  pkg_t *pkg = installed_pkgs->pkgs[i];
-	  str_list_t *installed_files = pkg_get_installed_files(pkg); /* this causes installed_files to be cached */
-	  str_list_elt_t *iter;
-	  if (installed_files == NULL) {
-	       ipkg_message(conf, IPKG_ERROR, "No installed files for pkg %s\n", pkg->name);
-	       break;
-	  }
-	  for (iter = installed_files->head; iter; iter = iter->next) {
-	       char *installed_file = iter->data;
-	       // ipkg_message(conf, IPKG_DEBUG2, "pkg %s: file=%s\n", pkg->name, installed_file);
-	       file_hash_set_file_owner(conf, installed_file, pkg);
-	  }
-     }
-     pkg_vec_free(installed_pkgs);
-
-     return 0;
-}
-
-struct pkg_write_filelist_data {
-     ipkg_conf_t *conf;
-     pkg_t *pkg;
-     FILE *stream;
-};
-
-void pkg_write_filelist_helper(const char *key, void *entry_, void *data_)
-{
-     struct pkg_write_filelist_data *data = data_;
-     pkg_t *entry = entry_;
-     if (entry == data->pkg) {
-	  fprintf(data->stream, "%s\n", key);
-     }
-}
-
-int pkg_write_filelist(ipkg_conf_t *conf, pkg_t *pkg)
-{
-     struct pkg_write_filelist_data data;
-     char *list_file_name = NULL;
-     int err = 0;
-
-     if (!pkg) {
-	  ipkg_message(conf, IPKG_ERROR, "Null pkg\n");
-	  return -EINVAL;
-     }
-     ipkg_message(conf, IPKG_INFO,
-		  "    creating %s.list file\n", pkg->name);
-     sprintf_alloc(&list_file_name, "%s/%s.list", pkg->dest->info_dir, pkg->name);
-     if (!list_file_name) {
-	  ipkg_message(conf, IPKG_ERROR, "Failed to alloc list_file_name\n");
-	  return -ENOMEM;
-     }
-     ipkg_message(conf, IPKG_INFO,
-		  "    creating %s file for pkg %s\n", list_file_name, pkg->name);
-     data.stream = fopen(list_file_name, "w");
-     if (!data.stream) {
-	  ipkg_message(conf, IPKG_ERROR, "Could not open %s for writing: %s\n",
-		       list_file_name, strerror(errno));
-		       return errno;
-     }
-     data.pkg = pkg;
-     data.conf = conf;
-     hash_table_foreach(&conf->file_hash, pkg_write_filelist_helper, &data);
-     fclose(data.stream);
-     free(list_file_name);
-
-     return err;
-}
-
-int pkg_write_changed_filelists(ipkg_conf_t *conf)
-{
-     pkg_vec_t *installed_pkgs = pkg_vec_alloc();
-     hash_table_t *pkg_hash = &conf->pkg_hash;
-     int i;
-     int err;
-     if (conf->noaction)
-	  return 0;
-
-     ipkg_message(conf, IPKG_INFO, "%s: saving changed filelists\n", __FUNCTION__);
-     pkg_hash_fetch_all_installed(pkg_hash, installed_pkgs);
-     for (i = 0; i < installed_pkgs->len; i++) {
-	  pkg_t *pkg = installed_pkgs->pkgs[i];
-	  if (pkg->state_flag & SF_FILELIST_CHANGED) {
-               ipkg_message(conf, IPKG_DEBUG, "Calling pkg_write_filelist for pkg=%s from %s\n", pkg->name, __FUNCTION__);
-	       err = pkg_write_filelist(conf, pkg);
-	       if (err)
-		    ipkg_message(conf, IPKG_NOTICE, "pkg_write_filelist pkg=%s returned %d\n", pkg->name, err);
-	  }
-     }
-     return 0;
-}

Copied: trunk/src/target/opkg/pkg.c (from rev 3879, trunk/src/target/ipkg/pkg.c)

Deleted: trunk/src/target/opkg/pkg.h
===================================================================
--- trunk/src/target/ipkg/pkg.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,232 +0,0 @@
-/* pkg.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 PKG_H
-#define PKG_H
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "pkg_vec.h"
-#include "str_list.h"
-#include "pkg_src.h"
-#include "pkg_dest.h"
-#include "ipkg_conf.h"
-#include "conffile_list.h"
-
-struct ipkg_conf;
-
-
-#define ARRAY_SIZE(array) sizeof(array) / sizeof((array)[0])
-
-/* I think "Size" is currently the shortest field name */
-#define PKG_MINIMUM_FIELD_NAME_LEN 4
-
-enum pkg_state_want
-{
-    SW_UNKNOWN = 1,
-    SW_INSTALL,
-    SW_DEINSTALL,
-    SW_PURGE,
-    SW_LAST_STATE_WANT
-};
-typedef enum pkg_state_want pkg_state_want_t;
-
-enum pkg_state_flag
-{
-    SF_OK        = 0,
-    SF_REINSTREQ = 1,
-    SF_HOLD      = 2,  /* do not upgrade version */
-    SF_REPLACE   = 4,  /* replace this package */
-    SF_NOPRUNE   = 8,  /* do not remove obsolete files */
-    SF_PREFER    = 16, /* prefer this version */
-    SF_OBSOLETE  = 32, /* old package in upgrade pair */
-    SF_MARKED    = 64, /* temporary mark */
-    SF_FILELIST_CHANGED = 128, /* needs filelist written */
-    SF_USER      = 256,
-    SF_LAST_STATE_FLAG
-};
-typedef enum pkg_state_flag pkg_state_flag_t;
-#define SF_NONVOLATILE_FLAGS (SF_HOLD|SF_NOPRUNE|SF_PREFER|SF_OBSOLETE|SF_USER)
-
-enum pkg_state_status
-{
-    SS_NOT_INSTALLED = 1,
-    SS_UNPACKED,
-    SS_HALF_CONFIGURED,
-    SS_INSTALLED,
-    SS_HALF_INSTALLED,
-    SS_CONFIG_FILES,
-    SS_POST_INST_FAILED,
-    SS_REMOVAL_FAILED,
-    SS_LAST_STATE_STATUS
-};
-typedef enum pkg_state_status pkg_state_status_t;
-
-struct abstract_pkg{
-    char * name;
-    int dependencies_checked;
-    pkg_vec_t * pkgs;
-    pkg_state_status_t state_status;
-    pkg_state_flag_t state_flag;
-    struct abstract_pkg ** depended_upon_by; /* @@@@ this should be abstract_pkg_vec_t -Jamey */
-    abstract_pkg_vec_t * provided_by;
-    abstract_pkg_vec_t * replaced_by;
-};
-
-#include "pkg_depends.h"
-
-/* XXX: CLEANUP: I'd like to clean up pkg_t in several ways:
-
-   The 3 version fields should go into a single version struct. (This
-   is especially important since, currently, pkg->version can easily
-   be mistaken for pkg_verson_str_alloc(pkg) although they are very
-   distinct. This has been the source of multiple bugs.
-
-   The 3 state fields could possibly also go into their own struct.
-
-   All fields which deal with lists of packages, (Depends,
-   Pre-Depends, Provides, Suggests, Recommends, Enhances), should each
-   be handled by a single struct in pkg_t
-
-   All string fields for which there is a small set of possible
-   values, (section, maintainer, architecture, maybe version?), that
-   are reused among different packages -- for all such packages we
-   should move from "char *"s to some atom datatype to share data
-   storage and use less memory. We might even do reference counting,
-   but probably not since most often we only create new pkg_t structs,
-   we don't often free them.  */
-struct pkg
-{
-     char *name;
-     unsigned long epoch;
-     char *version;
-     char *revision;
-     char *familiar_revision;
-     pkg_src_t *src;
-     pkg_dest_t *dest;
-     char *architecture;
-     char *section;
-     char *maintainer;
-     char *description;
-     pkg_state_want_t state_want;
-     pkg_state_flag_t state_flag;
-     pkg_state_status_t state_status;
-     char **depends_str;
-     int depends_count;
-     char **pre_depends_str;
-     int pre_depends_count;
-     char **recommends_str;
-     int recommends_count;
-     char **suggests_str;
-     int suggests_count;
-     compound_depend_t * depends;
-
-     /* Abhaya: new conflicts */
-     char **conflicts_str;
-     compound_depend_t * conflicts;
-     int conflicts_count;
-	
-     char **replaces_str;
-     int replaces_count;
-     abstract_pkg_t ** replaces;
-
-     char **provides_str;
-     int provides_count;
-     abstract_pkg_t ** provides;
-
-     abstract_pkg_t *parent;
-
-     pkg_t *old_pkg; /* during upgrade, points from installee to previously installed */
-
-     char *filename;
-     char *local_filename;
-     char *url;
-     char *tmp_unpack_dir;
-     char *md5sum;
-     char *size;
-     char *installed_size;
-     char *priority;
-     char *source;
-     conffile_list_t conffiles;
-     time_t installed_time;
-     /* As pointer for lazy evaluation */
-     str_list_t *installed_files;
-     /* XXX: CLEANUP: I'd like to perhaps come up with a better
-	mechanism to avoid the problem here, (which is that the
-	installed_files list was being freed from an inner loop while
-	still being used within an outer loop. */
-     int installed_files_ref_cnt;
-     int essential;
-     int arch_priority;
-/* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package, if there are multiple choice */
-     int provided_by_hand;
-};
-
-pkg_t *pkg_new(void);
-int pkg_init(pkg_t *pkg);
-void pkg_deinit(pkg_t *pkg);
-int pkg_init_from_file(pkg_t *pkg, const char *filename);
-abstract_pkg_t *abstract_pkg_new(void);
-int abstract_pkg_init(abstract_pkg_t *ab_pkg);
-
-/* 
- * merges fields from newpkg into oldpkg.
- * Forcibly sets oldpkg state_status, state_want and state_flags if set_status is nonzero 
- */
-int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status);
-
-char *pkg_version_str_alloc(pkg_t *pkg);
-
-int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg);
-int pkg_name_version_and_architecture_compare(void *a, void *b);
-int abstract_pkg_name_compare(void *a, void *b);
-
-char * pkg_formatted_info(pkg_t *pkg );
-char * pkg_formatted_field(pkg_t *pkg, const char *field );
-
-void set_flags_from_control(ipkg_conf_t *conf, pkg_t *pkg);
-
-void pkg_print_info(pkg_t *pkg, FILE *file);
-void pkg_print_status(pkg_t * pkg, FILE * file);
-void pkg_print_field(pkg_t *pkg, FILE *file, const char *field);
-str_list_t *pkg_get_installed_files(pkg_t *pkg);
-int pkg_free_installed_files(pkg_t *pkg);
-int pkg_remove_installed_files_list(ipkg_conf_t *conf, pkg_t *pkg);
-conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name);
-int pkg_run_script(struct ipkg_conf *conf, pkg_t *pkg,
-		   const char *script, const char *args);
-
-/* enum mappings */
-char *pkg_state_want_to_str(pkg_state_want_t sw);
-pkg_state_want_t pkg_state_want_from_str(char *str);
-char *pkg_state_flag_to_str(pkg_state_flag_t sf);
-pkg_state_flag_t pkg_state_flag_from_str(char *str);
-char *pkg_state_status_to_str(pkg_state_status_t ss);
-pkg_state_status_t pkg_state_status_from_str(char *str);
-
-int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op);
-
-int pkg_arch_supported(ipkg_conf_t *conf, pkg_t *pkg);
-int pkg_info_preinstall_check(ipkg_conf_t *conf);
-int pkg_free_installed_files(pkg_t *pkg);
-
-int pkg_write_filelist(ipkg_conf_t *conf, pkg_t *pkg);
-int pkg_write_changed_filelists(ipkg_conf_t *conf);
-
-#endif

Copied: trunk/src/target/opkg/pkg.h (from rev 3879, trunk/src/target/ipkg/pkg.h)

Deleted: trunk/src/target/opkg/pkg_depends.c
===================================================================
--- trunk/src/target/ipkg/pkg_depends.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg_depends.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,1033 +0,0 @@
-/* pkg_depends.c - the itsy package management system
-
-   Steven M. Ayer
-   
-   Copyright (C) 2002 Compaq Computer Corporation
-
-   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 "ipkg.h"
-#include <errno.h>
-#include <ctype.h>
-   
-#include "pkg.h"
-#include "ipkg_utils.h"
-#include "pkg_hash.h"
-#include "ipkg_message.h"
-#include "pkg_parse.h"
-#include "hash_table.h"
-
-static int parseDepends(compound_depend_t *compound_depend, hash_table_t * hash, char * depend_str);
-static depend_t * depend_init(void);
-static void depend_deinit(depend_t *d);
-static char ** add_unresolved_dep(pkg_t * pkg, char ** the_lost, int ref_ndx);
-static char ** merge_unresolved(char ** oldstuff, char ** newstuff);
-static int is_pkg_in_pkg_vec(pkg_vec_t * vec, pkg_t * pkg);
-
-static int pkg_installed_and_constraint_satisfied(pkg_t *pkg, void *cdata)
-{
-     depend_t *depend = (depend_t *)cdata;
-     if ((pkg->state_status == SS_INSTALLED || pkg->state_status == SS_UNPACKED) && version_constraints_satisfied(depend, pkg))
-	  return 1;
-     else
-	  return 0;
-}
-
-static int pkg_constraint_satisfied(pkg_t *pkg, void *cdata)
-{
-     depend_t *depend = (depend_t *)cdata;
-#if 0
-     pkg_t * temp = pkg_new();
-     int comparison;
-     parseVersion(temp, depend->version);
-     comparison = pkg_compare_versions(pkg, temp);
-     free(temp);
-
-     fprintf(stderr, "%s: pkg=%s pkg->version=%s constraint=%p type=%d version=%s comparison=%d satisfied=%d\n", 
-	     __FUNCTION__, pkg->name, pkg->version, 
-	     depend, depend->constraint, depend->version,
-	     comparison, version_constraints_satisfied(depend, pkg));
-#endif
-     if (version_constraints_satisfied(depend, pkg))
-	  return 1;
-     else
-	  return 0;
-}
-
-/* returns ndependences or negative error value */ 
-int pkg_hash_fetch_unsatisfied_dependencies(ipkg_conf_t *conf, pkg_t * pkg, 
-					    pkg_vec_t *unsatisfied, char *** unresolved)
-{
-     pkg_t * satisfier_entry_pkg;
-     register int i, j, k;
-     int count, found;
-     char ** the_lost;
-     abstract_pkg_t * ab_pkg;
-
-     /* 
-      * this is a setup to check for redundant/cyclic dependency checks, 
-      * which are marked at the abstract_pkg level
-      */
-     if (!(ab_pkg = pkg->parent)) {
-	  fprintf(stderr, "%s:%d: something terribly wrong with pkg %s\n", __FUNCTION__, __LINE__, pkg->name);
-	  *unresolved = NULL;
-	  return 0;
-     }
-     if (ab_pkg->dependencies_checked) {    /* avoid duplicate or cyclic checks */
-	  *unresolved = NULL;
-	  return 0;
-     } else { 
-	  ab_pkg->dependencies_checked = 1;  /* mark it for subsequent visits */
-     }
-     /**/
-
-     count = pkg->pre_depends_count + pkg->depends_count + pkg->recommends_count + pkg->suggests_count;
-     if (!count){
-	  *unresolved = NULL;
-	  return 0;
-     }
-
-     the_lost = NULL;
-	
-     /* foreach dependency */
-     for (i = 0; i < count; i++) {
-	  compound_depend_t * compound_depend = &pkg->depends[i];
-	  depend_t ** possible_satisfiers = compound_depend->possibilities;;
-	  found = 0;
-	  satisfier_entry_pkg = NULL;
-
-	  if (compound_depend->type == GREEDY_DEPEND) {
-	       /* foreach possible satisfier */
-	       for (j = 0; j < compound_depend->possibility_count; j++) {
-		    /* foreach provided_by, which includes the abstract_pkg itself */
-		    abstract_pkg_t *abpkg = possible_satisfiers[j]->pkg;
-		    abstract_pkg_vec_t *ab_provider_vec = abpkg->provided_by;
-		    int nposs = ab_provider_vec->len;
-		    abstract_pkg_t **ab_providers = ab_provider_vec->pkgs; 
-		    int l;
-		    for (l = 0; l < nposs; l++) {
-			 pkg_vec_t *test_vec = ab_providers[l]->pkgs;
-			 /* if no depends on this one, try the first package that Provides this one */
-			 if (!test_vec){   /* no pkg_vec hooked up to the abstract_pkg!  (need another feed?) */
-			      continue;
-			 }
-	      
-			 /* cruise this possiblity's pkg_vec looking for an installed version */
-			 for (k = 0; k < test_vec->len; k++) {
-			      pkg_t *pkg_scout = test_vec->pkgs[k];
-			      /* not installed, and not already known about? */
-			      if ((pkg_scout->state_want != SW_INSTALL)
-				  && !pkg_scout->parent->dependencies_checked
-				  && !is_pkg_in_pkg_vec(unsatisfied, pkg_scout)) {
-				   char ** newstuff = NULL;
-				   int rc;
-				   pkg_vec_t *tmp_vec = pkg_vec_alloc ();
-				   /* check for not-already-installed dependencies */
-				   rc = pkg_hash_fetch_unsatisfied_dependencies(conf, 
-										pkg_scout, 
-										tmp_vec,
-										&newstuff);
-				   if (newstuff == NULL) {
-					int i;
-					int ok = 1;
-					for (i = 0; i < rc; i++) {
-					    pkg_t *p = tmp_vec->pkgs[i];
-					    if (p->state_want == SW_INSTALL)
-						continue;
-					    ipkg_message(conf, IPKG_DEBUG, "not installing %s due to requirement for %s\n", pkg_scout->name, p->name);
-					    ok = 0;
-					    break;
-					}
-					pkg_vec_free (tmp_vec);
-					if (ok) {
-					    /* mark this one for installation */
-					    ipkg_message(conf, IPKG_NOTICE, "Adding satisfier for greedy dependence: %s\n", pkg_scout->name);
-					    pkg_vec_insert(unsatisfied, pkg_scout);
-					}
-				   } else  {
-					ipkg_message(conf, IPKG_DEBUG, "not installing %s due to broken depends \n", pkg_scout->name);
-					free (newstuff);
-				   }
-			      }
-			 }
-		    }
-	       }
-
-	       continue;
-	  }
-
-	  /* foreach possible satisfier, look for installed package  */
-	  for (j = 0; j < compound_depend->possibility_count; j++) {
-	       /* foreach provided_by, which includes the abstract_pkg itself */
-	       depend_t *dependence_to_satisfy = possible_satisfiers[j];
-	       abstract_pkg_t *satisfying_apkg = possible_satisfiers[j]->pkg;
-	       pkg_t *satisfying_pkg = 
-		    pkg_hash_fetch_best_installation_candidate(conf, satisfying_apkg, 
-							       pkg_installed_and_constraint_satisfied, 
-							       dependence_to_satisfy, 1);
-               /* Being that I can't test constraing in pkg_hash, I will test it here */
-	       if (satisfying_pkg != NULL) {
-                  if (!pkg_installed_and_constraint_satisfied ( satisfying_pkg,dependence_to_satisfy)) {
-	              satisfying_pkg = NULL;
-                  }
-               }
-	       ipkg_message(conf, IPKG_DEBUG, "%s:%d: satisfying_pkg=%p \n", __FILE__, __LINE__, satisfying_pkg);
-	       if (satisfying_pkg != NULL) {
-		    found = 1;
-		    break;
-	       }
-
-	  }
-	  /* if nothing installed matches, then look for uninstalled satisfier */
-	  if (!found) {
-	       /* foreach possible satisfier, look for installed package  */
-	       for (j = 0; j < compound_depend->possibility_count; j++) {
-		    /* foreach provided_by, which includes the abstract_pkg itself */
-		    depend_t *dependence_to_satisfy = possible_satisfiers[j];
-		    abstract_pkg_t *satisfying_apkg = possible_satisfiers[j]->pkg;
-		    pkg_t *satisfying_pkg = 
-			 pkg_hash_fetch_best_installation_candidate(conf, satisfying_apkg, 
-								    pkg_constraint_satisfied, 
-								    dependence_to_satisfy, 1);
-                    /* Being that I can't test constraing in pkg_hash, I will test it here too */
-	            if (satisfying_pkg != NULL) {
-                         if (!pkg_constraint_satisfied ( satisfying_pkg,dependence_to_satisfy)) {
-                            satisfying_pkg = NULL;
-                         }
-                    }
-
-		    /* user request overrides package recommendation */
-		    if (satisfying_pkg != NULL
-			&& (compound_depend->type == RECOMMEND || compound_depend->type == SUGGEST)
-			&& (satisfying_pkg->state_want == SW_DEINSTALL || satisfying_pkg->state_want == SW_PURGE)) {
-			 ipkg_message (conf, IPKG_NOTICE, "%s: ignoring recommendation for %s at user request\n",
-				       pkg->name, satisfying_pkg->name);
-			 continue;
-		    }
-
-		    ipkg_message(conf, IPKG_DEBUG, "%s:%d: satisfying_pkg=%p\n", __FILE__, __LINE__, satisfying_pkg);
-		    if (satisfying_pkg != NULL) {
-			 satisfier_entry_pkg = satisfying_pkg;
-			 break;
-		    }
-	       }
-	  }
-
-	  /* we didn't find one, add something to the unsatisfied vector */
-	  if (!found) {
-	       if (!satisfier_entry_pkg) {
-		    /* failure to meet recommendations is not an error */
-		    if (compound_depend->type != RECOMMEND && compound_depend->type != SUGGEST)
-			 the_lost = add_unresolved_dep(pkg, the_lost, i);
-		    else
-			 ipkg_message (conf, IPKG_NOTICE, "%s: unsatisfied recommendation for %s\n",
-				       pkg->name, compound_depend->possibilities[0]->pkg->name);
-	       }
-	       else {
-		    if (compound_depend->type == SUGGEST) {
-			 /* just mention it politely */
-			 ipkg_message (conf, IPKG_NOTICE, "package %s suggests installing %s\n",
-				       pkg->name, satisfier_entry_pkg->name);
-		    } else {
-			 char ** newstuff = NULL;
-			 
-			 if (satisfier_entry_pkg != pkg &&
-			     !is_pkg_in_pkg_vec(unsatisfied, satisfier_entry_pkg)) {
-			      pkg_vec_insert(unsatisfied, satisfier_entry_pkg);
-			      pkg_hash_fetch_unsatisfied_dependencies(conf, 
-								      satisfier_entry_pkg, 
-								      unsatisfied,
-								      &newstuff);
-			      the_lost = merge_unresolved(the_lost, newstuff);
-			 }
-		    }
-	       }
-	  }
-     }
-     *unresolved = the_lost;
-
-     return unsatisfied->len;
-}
-
-/*checking for conflicts !in replaces 
-  If a packages conflicts with another but is also replacing it, I should not consider it a 
-  really conflicts 
-  returns 0 if conflicts <> replaces or 1 if conflicts == replaces 
-*/
-int is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg)
-{
-    int i ;
-    int replaces_count = pkg->replaces_count;
-    abstract_pkg_t **replaces;
-
-    if (pkg->replaces_count==0)    // No replaces, it's surely a conflict
-        return 0;
-
-    replaces = pkg->replaces;
-
-    for (i = 0; i < replaces_count; i++) {
-        if (strcmp(pkg_scout->name,pkg->replaces[i]->name)==0) {      // Found
-            ipkg_message(NULL, IPKG_DEBUG2, "Seems I've found a replace %s %s \n",pkg_scout->name,pkg->replaces[i]->name);
-            return 1;
-        }
-    }
-    return 0;
-
-}
-
-
-/* Abhaya: added support for conflicts */
-pkg_vec_t * pkg_hash_fetch_conflicts(hash_table_t * hash, pkg_t * pkg)
-{
-    pkg_vec_t * installed_conflicts, * test_vec;
-    compound_depend_t * conflicts;
-    depend_t ** possible_satisfiers;
-    depend_t * possible_satisfier;
-    register int i, j, k;
-    int count;
-    abstract_pkg_t * ab_pkg;
-    pkg_t **pkg_scouts; 
-    pkg_t *pkg_scout; 
-
-    /* 
-     * this is a setup to check for redundant/cyclic dependency checks, 
-     * which are marked at the abstract_pkg level
-     */
-    if(!(ab_pkg = pkg->parent)){
-	fprintf(stderr, "dependency check error.  pkg %s isn't in hash table\n", pkg->name);
-	return (pkg_vec_t *)NULL;
-    }
-
-    conflicts = pkg->conflicts;
-    if(!conflicts){
-	return (pkg_vec_t *)NULL;
-    }
-    installed_conflicts = pkg_vec_alloc();
-
-    count = pkg->conflicts_count;
-
-
-
-    /* foreach conflict */
-    for(i = 0; i < pkg->conflicts_count; i++){
-
-	possible_satisfiers = conflicts->possibilities;
-
-	/* foreach possible satisfier */
-	for(j = 0; j < conflicts->possibility_count; j++){
-            possible_satisfier = possible_satisfiers[j];
-            if (!possible_satisfier)
-                fprintf(stderr, "%s:%d: possible_satisfier is null\n", __FUNCTION__, __LINE__);
-            if (!possible_satisfier->pkg)
-                fprintf(stderr, "%s:%d: possible_satisfier->pkg is null\n", __FUNCTION__, __LINE__);
-	    test_vec = possible_satisfier->pkg->pkgs;
-	    if (test_vec) {
-                /* pkg_vec found, it is an actual package conflict
-		 * cruise this possiblity's pkg_vec looking for an installed version */
-		pkg_scouts = test_vec->pkgs;
-		for(k = 0; k < test_vec->len; k++){
-                    pkg_scout = pkg_scouts[k];
-                    if (!pkg_scout) {
-                        fprintf(stderr,  "%s: null pkg scout\n", __FUNCTION__);
-                        continue; 
-                    }
-		    if ((pkg_scout->state_status == SS_INSTALLED || pkg_scout->state_want == SW_INSTALL) &&
-		       version_constraints_satisfied(possible_satisfier, pkg_scout) && !is_pkg_a_replaces(pkg_scout,pkg)){
- 	 	        if (!is_pkg_in_pkg_vec(installed_conflicts, pkg_scout)){
-			    pkg_vec_insert(installed_conflicts, pkg_scout);
-			}
-		    }
-		}
-	    }
-	}
-	conflicts++;
-    }
-
-    if (installed_conflicts->len)
-	    return installed_conflicts;
-    pkg_vec_free(installed_conflicts);
-	return (pkg_vec_t *)NULL;
-}
-
-int version_constraints_satisfied(depend_t * depends, pkg_t * pkg)
-{
-    pkg_t * temp;
-    int comparison;
-
-    if(depends->constraint == NONE)
-	return 1;
-
-    temp = pkg_new();
-
-    parseVersion(temp, depends->version);
-
-    comparison = pkg_compare_versions(pkg, temp);
-
-    free(temp);
-
-    if((depends->constraint == EARLIER) && 
-       (comparison < 0))
-	return 1;
-    else if((depends->constraint == LATER) && 
-	    (comparison > 0))
-	return 1;
-    else if(comparison == 0)
-	return 1;
-    else if((depends->constraint == LATER_EQUAL) && 
-	    (comparison >= 0))
-	return 1;
-    else if((depends->constraint == EARLIER_EQUAL) && 
-	    (comparison <= 0))
-	return 1;
-    
-    return 0;
-}
-
-int pkg_dependence_satisfiable(ipkg_conf_t *conf, depend_t *depend)
-{
-     abstract_pkg_t *apkg = depend->pkg;
-     abstract_pkg_vec_t *provider_apkgs = apkg->provided_by;
-     int n_providers = provider_apkgs->len;
-     abstract_pkg_t **apkgs = provider_apkgs->pkgs;
-     pkg_vec_t *pkg_vec;
-     int n_pkgs ; 
-     int i;
-     int j;
-
-     for (i = 0; i < n_providers; i++) {
-	  abstract_pkg_t *papkg = apkgs[i];
-	  pkg_vec = papkg->pkgs;
-	  if (pkg_vec) {
-	       n_pkgs = pkg_vec->len;
-	       for (j = 0; j < n_pkgs; j++) {
-		    pkg_t *pkg = pkg_vec->pkgs[j];
-		    if (version_constraints_satisfied(depend, pkg)) {
-			 return 1;
-		    }
-	       }
-	  }
-     }
-     return 0;
-}
-
-int pkg_dependence_satisfied(ipkg_conf_t *conf, depend_t *depend)
-{
-     abstract_pkg_t *apkg = depend->pkg;
-     abstract_pkg_vec_t *provider_apkgs = apkg->provided_by;
-     int n_providers = provider_apkgs->len;
-     abstract_pkg_t **apkgs = provider_apkgs->pkgs;
-     int i;
-     int n_pkgs;
-     int j;
-
-     for (i = 0; i < n_providers; i++) {
-	  abstract_pkg_t *papkg = apkgs[i];
-	  pkg_vec_t *pkg_vec = papkg->pkgs;
-	  if (pkg_vec) {
-	       n_pkgs = pkg_vec->len;
-	       for (j = 0; j < n_pkgs; j++) {
-		    pkg_t *pkg = pkg_vec->pkgs[j];
-		    if (version_constraints_satisfied(depend, pkg)) {
-			 if (pkg->state_status == SS_INSTALLED || pkg->state_status == SS_UNPACKED)
-			      return 1;
-		    }
-	       }
-	  }
-     }
-     return 0;
-}
-
-static int is_pkg_in_pkg_vec(pkg_vec_t * vec, pkg_t * pkg)
-{
-    register int i;
-    pkg_t ** pkgs = vec->pkgs;
-
-    for(i = 0; i < vec->len; i++)
-	if((strcmp(pkg->name, (*(pkgs + i))->name) == 0)
-	   && (pkg_compare_versions(pkg, *(pkgs + i)) == 0)
-	   && (strcmp(pkg->architecture, (*(pkgs + i))->architecture) == 0))
-	    return 1;
-    return 0;
-}
-
-
-#ifdef DeadCode
-/**
- * pkg_has_common_provides returns 1 if pkg and replacee both provide
- * the same abstract package and 0 otherwise.
- */
-int pkg_has_common_provides(pkg_t *pkg, pkg_t *replacee)
-{
-     abstract_pkg_t **provides = pkg->provides;
-     int provides_count = pkg->provides_count;
-     abstract_pkg_t **replacee_provides = replacee->provides;
-     int replacee_provides_count = replacee->provides_count;
-     int i, j;
-     for (i = 0; i < provides_count; i++) {
-	  abstract_pkg_t *apkg = provides[i];
-	  for (j = 0; j < replacee_provides_count; j++) {
-	       abstract_pkg_t *replacee_apkg = replacee_provides[i];
-	       if (apkg == replacee_apkg)
-		    return 1;
-	  }
-     }
-     return 0;
-}
-#endif
-
-/**
- * pkg_provides_abstract returns 1 if pkg->provides contains providee
- * and 0 otherwise.
- */
-int pkg_provides_abstract(pkg_t *pkg, abstract_pkg_t *providee)
-{
-     abstract_pkg_t **provides = pkg->provides;
-     int provides_count = pkg->provides_count;
-     int i;
-     for (i = 0; i < provides_count; i++) {
-	  if (provides[i] == providee)
-	       return 1;
-     }
-     return 0;
-}
-
-/**
- * pkg_replaces returns 1 if pkg->replaces contains one of replacee's provides and 0
- * otherwise.
- */
-int pkg_replaces(pkg_t *pkg, pkg_t *replacee)
-{
-     abstract_pkg_t **replaces = pkg->replaces;
-     int replaces_count = pkg->replaces_count;
-     /* abstract_pkg_t **replacee_provides = pkg->provides;
-     int replacee_provides_count = pkg->provides_count; */
-     int i, j;
-     for (i = 0; i < replaces_count; i++) {
-	  abstract_pkg_t *abstract_replacee = replaces[i];
-	  for (j = 0; j < replaces_count; j++) {
-   /*            ipkg_message(NULL, IPKG_DEBUG2, "Searching pkg-name %s repprovname %s absrepname %s \n",
-                 pkg->name,replacee->provides[j]->name, abstract_replacee->name); */
-	       if (replacee->provides[j] == abstract_replacee)
-		    return 1;
-	  }
-     }
-     return 0;
-}
-
-
-/**
- * pkg_conflicts_abstract returns 1 if pkg->conflicts contains conflictee and 0
- * otherwise.
- */
-int pkg_conflicts_abstract(pkg_t *pkg, abstract_pkg_t *conflictee)
-{
-     compound_depend_t *conflicts = pkg->conflicts;
-     int conflicts_count = pkg->conflicts_count;
-     int i, j;
-     for (i = 0; i < conflicts_count; i++) {
-	  int possibility_count = conflicts[i].possibility_count;
-	  struct depend **possibilities = conflicts[i].possibilities;
-	  for (j = 0; j < possibility_count; j++) {
-	       if (possibilities[j]->pkg == conflictee) {
-		    return 1;
-	       }
-	  }
-     }
-     return 0;
-}
-
-/**
- * pkg_conflicts returns 1 if pkg->conflicts contains one of
- * conflictee's provides and 0 otherwise.
- */
-int pkg_conflicts(pkg_t *pkg, pkg_t *conflictee)
-{
-     compound_depend_t *conflicts = pkg->conflicts;
-     int conflicts_count = pkg->conflicts_count;
-     abstract_pkg_t **conflictee_provides = conflictee->provides;
-     int conflictee_provides_count = conflictee->provides_count;
-     int i, j, k;
-     int possibility_count;
-     struct depend **possibilities;
-     abstract_pkg_t *possibility ;
-
-     for (i = 0; i < conflicts_count; i++) {
-	  possibility_count = conflicts[i].possibility_count;
-	  possibilities = conflicts[i].possibilities;
-	  for (j = 0; j < possibility_count; j++) {
-	       possibility = possibilities[j]->pkg;
-	       for (k = 0; k < conflictee_provides_count; k++) {
-		    if (possibility == conflictee_provides[k]) {
-			 return 1;
-		    }
-	       }
-	  }
-     }
-     return 0;
-}
-
-static char ** merge_unresolved(char ** oldstuff, char ** newstuff)
-{
-    int oldlen = 0, newlen = 0;
-    char ** result;
-    register int i, j;
-
-    if(!newstuff)
-	return oldstuff;
-    
-    while(oldstuff && oldstuff[oldlen]) oldlen++;
-    while(newstuff && newstuff[newlen]) newlen++;
-    
-    result = (char **)realloc(oldstuff, sizeof(char *) * (oldlen + newlen + 1));
-    if (result == NULL) {
-        fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-        return NULL;
-    }
-    
-    for(i = oldlen, j = 0; i < (oldlen + newlen); i++, j++)
-	*(result + i) = *(newstuff + j);
-    
-    *(result + i) = NULL;
-
-    return result;
-}
-    
-/* 
- * a kinda kludgy way to back out depends str from two different arrays (reg'l'r 'n pre)
- * this is null terminated, no count is carried around 
- */
-char ** add_unresolved_dep(pkg_t * pkg, char ** the_lost, int ref_ndx)
-{
-    int count;
-    char ** resized;
-    char *depend_str = pkg_depend_str(pkg, ref_ndx);
-
-    count = 0;
-    while(the_lost && the_lost[count]) count++;
-
-    count++;  /* need one to hold the null */
-    resized = (char **)realloc(the_lost, sizeof(char *) * (count + 1));
-    if (resized == NULL) {
-       fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-       return NULL;
-    }
-    resized[count - 1] = strdup(depend_str);
-    resized[count] = NULL;
-    
-    return resized;
-}
-	
-void printDepends(pkg_t * pkg)
-{
-    register int i, j;
-    compound_depend_t * depend;
-    int count;
-    
-    count = pkg->pre_depends_count + pkg->depends_count;
-    
-    depend = pkg->depends;
-    if(!depend){
-	fprintf(stderr, "Depends pointer is NULL\n");
-	return;
-    }
-    for(i = 0; i < count; i++){
-	fprintf(stderr, "%s has %d possibilities:\n", 
-		(depend->type == GREEDY_DEPEND) ? "Greedy-Depend" : ((depend->type == DEPEND) ? "Depend" : "Pre-Depend"),
-		depend->possibility_count);
-	for(j = 0; j < depend->possibility_count; j++)
-	    fprintf(stderr, "\t%s version %s (%d)\n",
-		    depend->possibilities[j]->pkg->name,
-		    depend->possibilities[j]->version,
-		    depend->possibilities[j]->constraint);
-	depend++;
-    }
-}
-
-int buildProvides(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg)
-{
-    register int i, j;
-
-    /* every pkg provides itself */
-    abstract_pkg_vec_insert(ab_pkg->provided_by, ab_pkg);
-
-    if (!pkg->provides_count)
-      return 0;
-
-    pkg->provides = (abstract_pkg_t **)malloc(sizeof(abstract_pkg_t *) * (pkg->provides_count + 1));
-    if (pkg->provides == NULL) {
-       fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-       return -1 ;
-    }
-    pkg->provides[0] = ab_pkg;
-
-    // if (strcmp(ab_pkg->name, pkg->name))
-    //     fprintf(stderr, __FUNCTION__ ": ab_pkg=%s pkg=%s\n", ab_pkg->name, pkg->name);
-
-    for(i = 0; i < pkg->provides_count; i++){
-	 abstract_pkg_t *provided_abpkg = ensure_abstract_pkg_by_name(hash, pkg->provides_str[i]);
-
-	pkg->provides[i+1] = provided_abpkg;
-
-	j = 0;
-	abstract_pkg_vec_insert(provided_abpkg->provided_by, ab_pkg);
-    }
-    return 0;
-}
-
-/* Abhaya: added conflicts support */
-int buildConflicts(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg)
-{
-    register int i;
-    compound_depend_t * conflicts;
-
-    if (!pkg->conflicts_count)
-	return 0;
-
-    conflicts = pkg->conflicts = malloc(sizeof(compound_depend_t) *
-					pkg->conflicts_count);
-    if (conflicts == NULL) {
-       fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-       return  -1;
-    }
-    for (i = 0; i < pkg->conflicts_count; i++) {
-	 conflicts->type = CONFLICTS;
-	 parseDepends(conflicts, hash,
-		      pkg->conflicts_str[i]);
-#if 0
-	 for (j = 0; j < conflicts->possibility_count; j++) {
-	      depend_t *possibility = conflicts->possibilities[j];
-	      abstract_pkg_t *conflicting_apkg = possibility->pkg;
-	      pkg_add_conflict_pair(ab_pkg, conflicting_apkg);
-	 }
-#endif
-	 conflicts++;
-    }
-    return 0;
-}
-
-int buildReplaces(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg)
-{
-     register int i, j;
-
-     if (!pkg->replaces_count)
-	  return 0;
-
-     pkg->replaces = (abstract_pkg_t **)malloc(sizeof(abstract_pkg_t *) * pkg->replaces_count);
-     if (pkg->replaces == NULL) {
-        fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-        return  -1;
-     }
-
-     // if (strcmp(ab_pkg->name, pkg->name))
-     //     fprintf(stderr, __FUNCTION__ ": ab_pkg=%s pkg=%s\n", ab_pkg->name, pkg->name);
-
-     for(i = 0; i < pkg->replaces_count; i++){
-	  abstract_pkg_t *old_abpkg = ensure_abstract_pkg_by_name(hash, pkg->replaces_str[i]);
-
-	  pkg->replaces[i] = old_abpkg;
-
-	  j = 0;
-	  if (!old_abpkg->replaced_by)
-	       old_abpkg->replaced_by = abstract_pkg_vec_alloc();
-               if ( old_abpkg->replaced_by == NULL ){
-                  return -1;
-               }
-	  /* if a package pkg both replaces and conflicts old_abpkg,
-	   * then add it to the replaced_by vector so that old_abpkg
-	   * will be upgraded to ab_pkg automatically */
-	  if (pkg_conflicts_abstract(pkg, old_abpkg))
-	       abstract_pkg_vec_insert(old_abpkg->replaced_by, ab_pkg);
-     }
-     return 0;
-}
-
-int buildDepends(hash_table_t * hash, pkg_t * pkg)
-{
-     int count;
-     register int i;
-     compound_depend_t * depends;
-
-     if(!(count = pkg->pre_depends_count + pkg->depends_count + pkg->recommends_count + pkg->suggests_count))
-	  return 0;
-
-     if (0 && pkg->pre_depends_count)
-	  fprintf(stderr, "pkg=%s pre_depends_count=%d depends_count=%d\n", 
-		  pkg->name, pkg->pre_depends_count, pkg->depends_count);
-     depends = pkg->depends = malloc(sizeof(compound_depend_t) * count);
-     if (depends == NULL) {
-        fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-        return  -1;
-     }
-     
-
-     for(i = 0; i < pkg->pre_depends_count; i++){
-	  parseDepends(depends, hash, pkg->pre_depends_str[i]);
-	  if (0 && pkg->pre_depends_count)
-	       fprintf(stderr, " pre_depends_str=%s depends=%p possibility_count=%x\n", 
-		       pkg->pre_depends_str[i], depends, depends->possibility_count);
-	  depends->type = PREDEPEND;
-	  depends++;
-     }
-
-     for(i = 0; i < pkg->recommends_count; i++){
-	  parseDepends(depends, hash, pkg->recommends_str[i]);
-	  if (0 && pkg->recommends_count)
-	       fprintf(stderr, " recommends_str=%s depends=%p possibility_count=%x\n", 
-		       pkg->recommends_str[i], depends, depends->possibility_count);
-	  depends->type = RECOMMEND;
-	  depends++;
-     }
-
-     for(i = 0; i < pkg->suggests_count; i++){
-	  parseDepends(depends, hash, pkg->suggests_str[i]);
-	  if (0 && pkg->suggests_count)
-	       fprintf(stderr, " suggests_str=%s depends=%p possibility_count=%x\n", 
-		       pkg->suggests_str[i], depends, depends->possibility_count);
-	  depends->type = SUGGEST;
-	  depends++;
-     }
-
-     for(i = 0; i < pkg->depends_count; i++){
-	  parseDepends(depends, hash, pkg->depends_str[i]);
-	  if (0 && pkg->depends_count)
-	       fprintf(stderr, " depends_str=%s depends=%p possibility_count=%x\n",
-		       pkg->depends_str[i], depends, depends->possibility_count);
-	  depends++;
-     }
-     return 0;
-}    
-
-/*
- * pkg_depend_string: returns the depends string specified by index.
- *   All 4 kinds of dependences: dependence, pre-dependence, recommend, and suggest are number starting from 0.
- *   [0,npredepends) -> returns pre_depends_str[index]
- *   [npredepends,npredepends+nrecommends) -> returns recommends_str[index]
- *   [npredepends+nrecommends,npredepends+nrecommends+nsuggests) -> returns recommends_str[index]
- *   [npredepends+nrecommends+nsuggests,npredepends+nrecommends+nsuggests+ndepends) -> returns depends_str[index]
- */
-char *pkg_depend_str(pkg_t *pkg, int index)
-{
-     if (index < pkg->pre_depends_count) {
-	  return pkg->pre_depends_str[index];
-     }
-     index -= pkg->pre_depends_count;
-
-     if (index < pkg->recommends_count) {
-	  return pkg->recommends_str[index];
-     }
-     index -= pkg->recommends_count;
-
-     if (index < pkg->suggests_count) {
-	  return pkg->suggests_str[index];
-     }
-     index -= pkg->suggests_count;
-
-     if (index < pkg->depends_count) {
-	  return pkg->depends_str[index];
-     }
-     fprintf(stderr, "pkg_depend_str: index %d out of range for pkg=%s\n", index, pkg->name);
-     return NULL;
-}
-
-void freeDepends(pkg_t *pkg)
-{
-    int i;
-
-    if (pkg == NULL || pkg->depends == NULL) {
-	return;
-    }
-
-    fprintf(stderr, "Freeing depends=%p\n", pkg->depends);
-    for (i=0; i < pkg->depends->possibility_count; i++) {
-	depend_deinit(pkg->depends->possibilities[i]);
-    }
-    free(pkg->depends->possibilities);
-    free(pkg->depends);
-    pkg->depends = NULL;
-}
-
-void buildDependedUponBy(pkg_t * pkg, abstract_pkg_t * ab_pkg)
-{
-     compound_depend_t * depends;
-     int count, othercount;
-     register int i, j;
-     abstract_pkg_t * ab_depend;
-     abstract_pkg_t ** temp;
-
-     count = pkg->pre_depends_count + pkg->depends_count;
-     depends = pkg->depends;
-
-	  if (0 && pkg->pre_depends_count)
-	       fprintf(stderr, "pkg=%s pre_depends_count=%d depends_count=%d\n",
-		       pkg->name, pkg->pre_depends_count, pkg->depends_count);
-     for (i = 0; i < count; i++) {
-	  if (0 && pkg->pre_depends_count)
-	       fprintf(stderr, "  i=%d possibility_count=%x depends=%p\n", i, depends->possibility_count, depends);
-	  for (j = 0; j < depends->possibility_count; j++){
-	       ab_depend = depends->possibilities[j]->pkg;
-	       if(!ab_depend->depended_upon_by)
-		    ab_depend->depended_upon_by = (abstract_pkg_t **)calloc(1, sizeof(abstract_pkg_t *));
-
-	       temp = ab_depend->depended_upon_by;
-	       othercount = 1;
-	       while(*temp){
-		    temp++;
-		    othercount++;
-	       }
-	       *temp = ab_pkg;
-
-	       ab_depend->depended_upon_by = (abstract_pkg_t **)realloc(ab_depend->depended_upon_by, 
-									(othercount + 1) * sizeof(abstract_pkg_t *));
-	       /* the array may have moved */
-	       temp = ab_depend->depended_upon_by + othercount;
-	       *temp = NULL;
-	  }
-	  depends++;
-     }
-}
-
-static depend_t * depend_init(void)
-{
-    depend_t * d = (depend_t *)malloc(sizeof(depend_t));    
-    if ( d==NULL ){
-        fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-        return NULL; 
-     }
-    d->constraint = NONE;
-    d->version = NULL;
-    d->pkg = NULL;
-    
-    return d;
-}
-
-static void depend_deinit(depend_t *d)
-{
-    free(d);
-}
-
-static int parseDepends(compound_depend_t *compound_depend, 
-			hash_table_t * hash, char * depend_str)
-{
-     char * pkg_name, buffer[2048];
-     int num_of_ors = 0;
-     register int i;
-     register char * src, * dest;
-     depend_t ** possibilities;
-
-     /* first count the number of ored possibilities for satisfying dependency */
-     src = depend_str;
-     while(*src)
-	  if(*src++ == '|')
-	       num_of_ors++;
-
-     compound_depend->type = DEPEND;
-
-     compound_depend->possibility_count = num_of_ors + 1;
-     possibilities = (depend_t **)malloc(sizeof(depend_t *) * (num_of_ors + 1));
-     if (!possibilities)
-	  return -ENOMEM;
-     compound_depend->possibilities = possibilities;
-
-     src = depend_str;
-     for(i = 0; i < num_of_ors + 1; i++){
-	  possibilities[i] = depend_init();
-          if (!possibilities[i])
-	       return -ENOMEM;
-	  /* gobble up just the name first */
-	  dest = buffer;
-	  while(*src &&
-		!isspace(*src) &&
-		(*src != '(') &&
-		(*src != '*') &&
-		(*src != '|'))
-	       *dest++ = *src++;
-	  *dest = '\0';
-	  pkg_name = trim_alloc(buffer);
-          if (pkg_name == NULL )
-	       return -ENOMEM;
-	
-	  /* now look at possible version info */
-	
-	  /* skip to next chars */
-	  if(isspace(*src))
-	       while(*src && isspace(*src)) src++;
-
-	  /* extract constraint and version */
-	  if(*src == '('){
-	       src++;
-	       if(!strncmp(src, "<<", 2)){
-		    possibilities[i]->constraint = EARLIER;
-		    src += 2;
-	       }
-	       else if(!strncmp(src, "<=", 2)){
-		    possibilities[i]->constraint = EARLIER_EQUAL;
-		    src += 2;
-	       }
-	       else if(!strncmp(src, ">=", 2)){
-		    possibilities[i]->constraint = LATER_EQUAL;
-		    src += 2;
-	       }
-	       else if(!strncmp(src, ">>", 2)){
-		    possibilities[i]->constraint = LATER;
-		    src += 2;
-	       }
-	       else if(!strncmp(src, "=", 1)){
-		    possibilities[i]->constraint = EQUAL;
-		    src++;
-	       }
-	       /* should these be here to support deprecated designations; dpkg does */
-	       else if(!strncmp(src, "<", 1)){
-		    possibilities[i]->constraint = EARLIER_EQUAL;
-		    src++;
-	       }
-	       else if(!strncmp(src, ">", 1)){
-		    possibilities[i]->constraint = LATER_EQUAL;
-		    src++; 
-	       }
-
-	       /* now we have any constraint, pass space to version string */
-	       while(isspace(*src)) src++;
-
-	       /* this would be the version string */
-	       dest = buffer;
-	       while(*src && *src != ')')
-		    *dest++ = *src++;
-	       *dest = '\0';
-	    
-	       possibilities[i]->version = trim_alloc(buffer);
-	       /*	   	    fprintf(stderr, "let's print the depends version string:");
-				    fprintf(stderr, "version %s\n", possibilities[i]->version);*/
-               if (possibilities[i]->version == NULL )
-	            return -ENOMEM;
-
-	 
-	  }
-	  /* hook up the dependency to its abstract pkg */
-	  possibilities[i]->pkg = ensure_abstract_pkg_by_name(hash, pkg_name);
-
-	  free(pkg_name);
-	
-	  /* now get past the ) and any possible | chars */
-	  while(*src &&
-		(isspace(*src) ||
-		 (*src == ')') ||
-		 (*src == '|')))
-	       src++;
-	  if (*src == '*')
-	  {
-	       compound_depend->type = GREEDY_DEPEND;
-	       src++;
-	  }
-     }
-
-     return 0;
-}

Copied: trunk/src/target/opkg/pkg_depends.c (from rev 3879, trunk/src/target/ipkg/pkg_depends.c)

Deleted: trunk/src/target/opkg/pkg_depends.h
===================================================================
--- trunk/src/target/ipkg/pkg_depends.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg_depends.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,105 +0,0 @@
-/* pkg_depends.h - the itsy package management system
-
-   Steven M. Ayer
-   
-   Copyright (C) 2002 Compaq Computer Corporation
-
-   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 PKG_DEPENDS_H
-#define PKG_DEPENDS_H
-
-#include "pkg.h"
-#include "pkg_hash.h"
-
-enum depend_type {
-    PREDEPEND,
-    DEPEND,
-    CONFLICTS,
-    GREEDY_DEPEND,
-    RECOMMEND,
-    SUGGEST
-};
-typedef enum depend_type depend_type_t;
-
-enum version_constraint {
-    NONE,
-    EARLIER,
-    EARLIER_EQUAL,
-    EQUAL,
-    LATER_EQUAL,
-    LATER
-};
-typedef enum version_constraint version_constraint_t;
-
-struct depend{
-    version_constraint_t constraint;
-    char * version;
-    abstract_pkg_t * pkg;
-};
-typedef struct depend depend_t;
-    
-struct compound_depend{
-    depend_type_t type;
-    int possibility_count;
-    struct depend ** possibilities;
-};
-typedef struct compound_depend compound_depend_t;
-
-#include "hash_table.h"
-
-int buildProvides(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg);
-int buildConflicts(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg);
-int buildReplaces(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg);
-int buildDepends(hash_table_t * hash, pkg_t * pkg);
-
-/**
- * pkg_has_common_provides returns 1 if pkg and replacee both provide
- * the same abstract package and 0 otherwise.
- */
-int pkg_has_common_provides(pkg_t *pkg, pkg_t *replacee);
-
-/**
- * pkg_provides returns 1 if pkg->provides contains providee and 0
- * otherwise.
- */
-int pkg_provides_abstract(pkg_t *pkg, abstract_pkg_t *providee);
-
-/**
- * pkg_replaces returns 1 if pkg->replaces contains one of replacee's provides and 0
- * otherwise.
- */
-int pkg_replaces(pkg_t *pkg, pkg_t *replacee);
-
-/**
- * pkg_conflicts_abstract returns 1 if pkg->conflicts contains conflictee provides and 0
- * otherwise.
- */
-int pkg_conflicts_abstract(pkg_t *pkg, abstract_pkg_t *conflicts);
-
-/**
- * pkg_conflicts returns 1 if pkg->conflicts contains one of conflictee's provides and 0
- * otherwise.
- */
-int pkg_conflicts(pkg_t *pkg, pkg_t *conflicts);
-
-char *pkg_depend_str(pkg_t *pkg, int index);
-void buildDependedUponBy(pkg_t * pkg, abstract_pkg_t * ab_pkg);
-void freeDepends(pkg_t *pkg);
-void printDepends(pkg_t * pkg);
-int version_constraints_satisfied(depend_t * depends, pkg_t * pkg);
-int pkg_hash_fetch_unsatisfied_dependencies(ipkg_conf_t *conf, pkg_t * pkg, pkg_vec_t *depends, char *** unresolved);
-pkg_vec_t * pkg_hash_fetch_conflicts(hash_table_t * hash, pkg_t * pkg);
-int pkg_dependence_satisfiable(ipkg_conf_t *conf, depend_t *depend);
-int pkg_dependence_satisfied(ipkg_conf_t *conf, depend_t *depend);
-
-#endif

Copied: trunk/src/target/opkg/pkg_depends.h (from rev 3879, trunk/src/target/ipkg/pkg_depends.h)

Deleted: trunk/src/target/opkg/pkg_dest.c
===================================================================
--- trunk/src/target/ipkg/pkg_dest.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg_dest.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,92 +0,0 @@
-/* pkg_dest.c - 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.
-*/
-
-#include "ipkg.h"
-
-#include "pkg_dest.h"
-#include "file_util.h"
-#include "str_util.h"
-#include "sprintf_alloc.h"
-
-int pkg_dest_init(pkg_dest_t *dest, const char *name, const char *root_dir,const char * lists_dir)
-{
-    dest->name = strdup(name);
-
-    /* Guarantee that dest->root_dir ends with a '/' */
-    if (str_ends_with(root_dir, "/")) {
-	dest->root_dir = strdup(root_dir);
-    } else {
-	sprintf_alloc(&dest->root_dir, "%s/", root_dir);
-    }
-    file_mkdir_hier(dest->root_dir, 0755);
-
-    sprintf_alloc(&dest->ipkg_dir, "%s%s",
-		  dest->root_dir, IPKG_STATE_DIR_PREFIX);
-    file_mkdir_hier(dest->ipkg_dir, 0755);
-
-    if (str_starts_with (lists_dir, "/")) 
-        sprintf_alloc(&dest->lists_dir, "%s", lists_dir);
-    else
-        sprintf_alloc(&dest->lists_dir, "/%s", lists_dir);
-
-    file_mkdir_hier(dest->lists_dir, 0755);
-
-    sprintf_alloc(&dest->info_dir, "%s/%s",
-		  dest->ipkg_dir, IPKG_INFO_DIR_SUFFIX);
-    file_mkdir_hier(dest->info_dir, 0755);
-
-    sprintf_alloc(&dest->status_file_name, "%s/%s",
-		  dest->ipkg_dir, IPKG_STATUS_FILE_SUFFIX);
-
-    sprintf_alloc(&dest->status_file_tmp_name, "%s/%s.tmp",
-		  dest->ipkg_dir, IPKG_STATUS_FILE_SUFFIX);
-
-    dest->status_file = NULL;
-
-    return 0;
-}
-
-void pkg_dest_deinit(pkg_dest_t *dest)
-{
-    free(dest->name);
-    dest->name = NULL;
-
-    free(dest->root_dir);
-    dest->root_dir = NULL;
-
-    free(dest->ipkg_dir);
-    dest->ipkg_dir = NULL;
-
-    free(dest->lists_dir);
-    dest->lists_dir = NULL;
-
-    free(dest->info_dir);
-    dest->info_dir = NULL;
-
-    free(dest->status_file_name);
-    dest->status_file_name = NULL;
-
-    free(dest->status_file_tmp_name);
-    dest->status_file_tmp_name = NULL;
-
-    if (dest->status_file) {
-	fclose(dest->status_file);
-    }
-    dest->status_file = NULL;
-
-    dest->root_dir = NULL;
-}

Copied: trunk/src/target/opkg/pkg_dest.c (from rev 3879, trunk/src/target/ipkg/pkg_dest.c)

Deleted: trunk/src/target/opkg/pkg_dest.h
===================================================================
--- trunk/src/target/ipkg/pkg_dest.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg_dest.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,38 +0,0 @@
-/* pkg_dest.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 PKG_DEST_H
-#define PKG_DEST_H
-
-typedef struct pkg_dest pkg_dest_t;
-struct pkg_dest
-{
-    char *name;
-    char *root_dir;
-    char *ipkg_dir;
-    char *lists_dir;
-    char *info_dir;
-    char *status_file_name;
-    char *status_file_tmp_name;
-    FILE *status_file;
-};
-
-int pkg_dest_init(pkg_dest_t *dest, const char *name, const char *root_dir,const char *lists_dir);
-void pkg_dest_deinit(pkg_dest_t *dest);
-
-#endif
-

Copied: trunk/src/target/opkg/pkg_dest.h (from rev 3879, trunk/src/target/ipkg/pkg_dest.h)

Deleted: trunk/src/target/opkg/pkg_dest_list.c
===================================================================
--- trunk/src/target/ipkg/pkg_dest_list.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg_dest_list.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,85 +0,0 @@
-/* pkg_dest_list.c - 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.
-*/
-
-#include "ipkg.h"
-
-#include "pkg_dest.h"
-#include "void_list.h"
-#include "pkg_dest_list.h"
-
-int pkg_dest_list_elt_init(pkg_dest_list_elt_t *elt, pkg_dest_t *data)
-{
-    return void_list_elt_init((void_list_elt_t *) elt, data);
-}
-
-void pkg_dest_list_elt_deinit(pkg_dest_list_elt_t *elt)
-{
-    void_list_elt_deinit((void_list_elt_t *) elt);
-}
-
-int pkg_dest_list_init(pkg_dest_list_t *list)
-{
-    return void_list_init((void_list_t *) list);
-}
-
-void pkg_dest_list_deinit(pkg_dest_list_t *list)
-{
-    pkg_dest_list_elt_t *iter;
-    pkg_dest_t *pkg_dest;
-
-    for (iter = list->head; iter; iter = iter->next) {
-	pkg_dest = iter->data;
-	pkg_dest_deinit(pkg_dest);
-
-	/* malloced in pkg_dest_list_append */
-	free(pkg_dest);
-	iter->data = NULL;
-    }
-    void_list_deinit((void_list_t *) list);
-}
-
-pkg_dest_t *pkg_dest_list_append(pkg_dest_list_t *list, const char *name,
-				 const char *root_dir,const char *lists_dir)
-{
-    int err;
-    pkg_dest_t *pkg_dest;
-
-    /* freed in plg_dest_list_deinit */
-    pkg_dest = malloc(sizeof(pkg_dest_t));
-    if (pkg_dest == NULL) {
-	fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	return NULL;
-    }
-
-    pkg_dest_init(pkg_dest, name, root_dir,lists_dir);
-    err = void_list_append((void_list_t *) list, pkg_dest);
-    if (err) {
-	return NULL;
-    }
-
-    return pkg_dest;
-}
-
-int pkg_dest_list_push(pkg_dest_list_t *list, pkg_dest_t *data)
-{
-    return void_list_push((void_list_t *) list, data);
-}
-
-pkg_dest_list_elt_t *pkg_dest_list_pop(pkg_dest_list_t *list)
-{
-    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
-}

Copied: trunk/src/target/opkg/pkg_dest_list.c (from rev 3879, trunk/src/target/ipkg/pkg_dest_list.c)

Deleted: trunk/src/target/opkg/pkg_extract.c
===================================================================
--- trunk/src/target/ipkg/pkg_extract.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg_extract.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,168 +0,0 @@
-/* pkg_extract.c - 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.
-*/
-
-#include "ipkg.h"
-#include <errno.h>
-
-#include "pkg_extract.h"
-
-#include "libbb/libbb.h"
-#include "file_util.h"
-#include "sprintf_alloc.h"
-
-/* assuage libb functions */
-const char *applet_name = "ipkg";
-
-int pkg_extract_control_file_to_stream(pkg_t *pkg, FILE *stream)
-{
-    char *buffer = deb_extract(pkg->local_filename, stderr,
-			       extract_control_tar_gz
-			       | extract_one_to_buffer,
-			       NULL, "./control");
-    if (buffer == NULL) {
-	return EINVAL;
-    }
-
-    /* XXX: QUESTION: Is there a way to do this directly with deb_extract now? */
-    fputs(buffer, stream);
-    free(buffer);
-
-    return 0;
-}
-
-int pkg_extract_control_files_to_dir(pkg_t *pkg, const char *dir)
-{
-    return pkg_extract_control_files_to_dir_with_prefix(pkg, dir, "");
-}
-
-int pkg_extract_control_files_to_dir_with_prefix(pkg_t *pkg,
-						 const char *dir,
-						 const char *prefix)
-{
-    char *dir_with_prefix;
-
-    sprintf_alloc(&dir_with_prefix, "%s/%s", dir, prefix);
-
-    deb_extract(pkg->local_filename, stderr,
-		extract_control_tar_gz
-                | extract_all_to_fs| extract_preserve_date
-		| extract_unconditional,
-		dir_with_prefix, NULL);
-
-    free(dir_with_prefix);
-
-    /* XXX: BUG: how do we know if deb_extract worked or not? This is
-       a defect in the current deb_extract from what I can tell.
-
-       Once this is fixed, audit all calls to deb_extract. */
-    return 0;
-}
-
-int pkg_extract_data_files_to_dir(pkg_t *pkg, const char *dir)
-{
-    deb_extract(pkg->local_filename, stderr,
-		extract_data_tar_gz
-                | extract_all_to_fs| extract_preserve_date
-		| extract_unconditional,
-		dir, NULL);
-
-    /* BUG: How do we know if deb_extract worked or not? This is a
-       defect in the current deb_extract from what I can tell. */
-    return 0;
-}
-
-int pkg_extract_data_file_names_to_file(pkg_t *pkg, const char *file_name)
-{
-     int err=0;
-     char *line, *data_file;
-     FILE *file;
-     FILE *tmp;
-
-     file = fopen(file_name, "w");
-     if (file == NULL) {
-	  fprintf(stderr, "%s: ERROR: Failed to open %s for writing.\n",
-		  __FUNCTION__, file_name);
-	  return EINVAL;
-     }
-
-     tmp = tmpfile();
-     if (pkg->installed_files) {
-	  str_list_elt_t *elt;
-	  for (elt = pkg->installed_files->head; elt; elt = elt->next) {
-	       fprintf(file, "%s\n", elt->data);
-	  }
-     } else {
-	  err = pkg_extract_data_file_names_to_stream(pkg, tmp);
-	  if (err) {
-	       fclose(file);
-	       fclose(tmp);
-	       return err;
-	  }
-
-	  /* Fixup data file names by removing the initial '.' */
-	  rewind(tmp);
-	  while (1) {
-	       line = file_read_line_alloc(tmp);
-	       if (line == NULL) {
-		    break;
-	       }
-
-	       data_file = line;
-	       if (*data_file == '.') {
-		    data_file++;
-	       }
-
-	       if (*data_file != '/') {
-		    fputs("/", file);
-	       }
-
-	       /* I have no idea why, but this is what dpkg does */
-	       if (strcmp(data_file, "/\n") == 0) {
-		    fputs("/.\n", file);
-	       } else {
-		    fputs(data_file, file);
-	       }
-	  }
-     }
-     fclose(tmp);
-     fclose(file);
-
-     return err;
-}
-
-int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file)
-{
-    /* XXX: DPKG_INCOMPATIBILITY: deb_extract will extract all of the
-       data file names with a '.' as the first character. I've taught
-       ipkg how to cope with the presence or absence of the '.', but
-       this may trip up dpkg.
-
-       For all I know, this could actually be a bug in ipkg-build. So,
-       I'll have to try installing some .debs and comparing the *.list
-       files.
-
-       If we wanted to, we could workaround the deb_extract behavior
-       right here, by writing to a tmpfile, then munging things as we
-       wrote to the actual stream. */
-     deb_extract(pkg->local_filename, file,
-		 extract_quiet | extract_data_tar_gz | extract_list,
-		 NULL, NULL);
-
-    /* BUG: How do we know if deb_extract worked or not? This is a
-       defect in the current deb_extract from what I can tell. */
-    return 0;
-}

Copied: trunk/src/target/opkg/pkg_extract.c (from rev 3879, trunk/src/target/ipkg/pkg_extract.c)

Deleted: trunk/src/target/opkg/pkg_hash.c
===================================================================
--- trunk/src/target/ipkg/pkg_hash.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg_hash.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,617 +0,0 @@
-/* ipkg_hash.c - the itsy package management system
-
-   Steven M. Ayer
-   
-   Copyright (C) 2002 Compaq Computer Corporation
-
-   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 "ipkg.h"
-#include <errno.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "hash_table.h"
-#include "pkg.h"
-#include "ipkg_message.h"
-#include "pkg_vec.h"
-#include "pkg_hash.h"
-#include "pkg_parse.h"
-#include "ipkg_utils.h"
-
-static abstract_pkg_t * add_new_abstract_pkg_by_name(hash_table_t * hash, const char * pkg_name);
-
-/*
- * this will talk to both feeds-lists files and installed status files
- * example api:
- *
- * hash_table_t hash;
- * pkg_hash_init(name, &hash, 1000);
- * pkg_hash_add_from_file(<feed filename>);
- *
- * the query function is just there as a shell to prove to me that this
- * sort of works, but isn't far from doing something useful
- * 
- * -sma, 12/21/01
- * modified: CDW 3 Jan. 2002
- */
-
-
-
-int pkg_hash_init(const char *name, hash_table_t *hash, int len)
-{
-  return hash_table_init(name, hash, len);
-}
-
-void pkg_hash_deinit(hash_table_t *hash)
-{
-  hash_table_deinit(hash);
-}
-
-
-/* Find the default arch for a given package status file if none is given. */
-static char *pkg_get_default_arch(ipkg_conf_t *conf)
-{
-     nv_pair_list_elt_t *l;
-     char *def_arch = HOST_CPU_STR;		/* Default arch */
-     int def_prio = 0;				/* Other archs override this */
-
-     l = conf->arch_list.head;
-
-     while (l) {
-	  nv_pair_t *nv = l->data;
-	  int priority = strtol(nv->value, NULL, 0);
-
-	  /* Check if this arch has higher priority, and is valid */
-	  if ((priority > def_prio) &&
-	      (strcmp(nv->name, "all")) && (strcmp(nv->name, "noarch"))) {
-	       /* Our new default */
-	       def_prio = priority;
-	       def_arch = nv->name;
-	  }
-	  l = l->next;
-     }
-
-     return strdup(def_arch);
-}
-
-int pkg_hash_add_from_file(ipkg_conf_t *conf, const char *file_name,
-			   pkg_src_t *src, pkg_dest_t *dest, int is_status_file)
-{
-     hash_table_t *hash = &conf->pkg_hash;
-     char **raw;
-     char **raw_start;
-     pkg_t *pkg;
-    
-     raw = raw_start = read_raw_pkgs_from_file(file_name);
-     if (!raw)
-        return -ENOMEM;
-
-     while(*raw){         /* don't worry, we'll increment raw in the parsing function */
-	  pkg = pkg_new();
-	  if (!pkg)
-	       return -ENOMEM;
-
-	  if (pkg_parse_raw(pkg, &raw, src, dest) == 0) {
-	       if (!pkg->architecture) {
-		    char *version_str = pkg_version_str_alloc(pkg);
-		    pkg->architecture = pkg_get_default_arch(conf);
-		    ipkg_message(conf, IPKG_ERROR, "Package %s version %s has no architecture specified, defaulting to %s.\n",
-				 pkg->name, version_str, pkg->architecture);
-		    free(version_str);
-	       }
-	       hash_insert_pkg(hash, pkg, is_status_file,conf);
-	  } else {
-	       free(pkg);
-	  }
-     }
-
-     /* XXX: CLEANUP: I'd like a cleaner interface for cleaning up
-	memory after read_raw_pkgs_from_file */
-     raw = raw_start;
-     while (*raw) {
-	  free(*raw++);
-     }
-     free(raw_start);
-     return 0;
-}
-
-abstract_pkg_t * abstract_pkg_fetch_by_name(hash_table_t * hash, const char * pkg_name)
-{
-  return (abstract_pkg_t *)hash_table_get(hash, pkg_name);
-}
-
-abstract_pkg_vec_t *pkg_hash_fetch_all_installation_candidates(hash_table_t *hash, const char *name)
-{
-    abstract_pkg_t *apkg = abstract_pkg_fetch_by_name(hash, name);
-    if (apkg)
-       return NULL;
-    return apkg->provided_by;
-}
-
-
-pkg_t *pkg_hash_fetch_best_installation_candidate(ipkg_conf_t *conf, abstract_pkg_t *apkg, 
-						  int (*constraint_fcn)(pkg_t *pkg, void *cdata), void *cdata, int quiet)
-{
-     int i; 
-     int nprovides = 0;
-     int nmatching = 0;
-     pkg_vec_t *matching_pkgs = pkg_vec_alloc();
-     abstract_pkg_vec_t *matching_apkgs = abstract_pkg_vec_alloc();
-     abstract_pkg_vec_t *provided_apkg_vec;
-     abstract_pkg_t **provided_apkgs;
-     abstract_pkg_vec_t *providers = abstract_pkg_vec_alloc();
-     pkg_t *latest_installed_parent = NULL;
-     pkg_t *latest_matching = NULL;
-     pkg_t *held_pkg = NULL;
-     pkg_t *good_pkg_by_name = NULL;
-
-     if (matching_apkgs == NULL || providers == NULL || 
-         apkg == NULL || apkg->provided_by == NULL || (apkg->provided_by->len == 0))
-	  return NULL;
-
-     ipkg_message(conf, IPKG_DEBUG, "best installation candidate for %s\n", apkg->name);
-
-     provided_apkg_vec = apkg->provided_by;
-     nprovides = provided_apkg_vec->len;
-     provided_apkgs = provided_apkg_vec->pkgs;
-     if (nprovides > 1)
-	  ipkg_message(conf, IPKG_DEBUG, " apkg=%s nprovides=%d\n", apkg->name, nprovides);
-
-     /* accumulate all the providers */
-     for (i = 0; i < nprovides; i++) {
-	  abstract_pkg_t *provider_apkg = provided_apkgs[i];
-	  ipkg_message(conf, IPKG_DEBUG, " adding %s to providers\n", provider_apkg->name);
-	  abstract_pkg_vec_insert(providers, provider_apkg);
-     }
-     nprovides = providers->len;
-
-     for (i = 0; i < nprovides; i++) {
-	  abstract_pkg_t *provider_apkg = abstract_pkg_vec_get(providers, i);
-	  abstract_pkg_t *replacement_apkg = NULL;
-	  pkg_vec_t *vec;
-
-	  if (provider_apkg->replaced_by && provider_apkg->replaced_by->len) {
-	       replacement_apkg = provider_apkg->replaced_by->pkgs[0];
-	       if (provider_apkg->replaced_by->len > 1) {
-		    ipkg_message(conf, IPKG_NOTICE, "Multiple replacers for %s, using first one (%s)\n", 
-				 provider_apkg->name, replacement_apkg->name);
-	       }
-	  }
-
-	  if (replacement_apkg)
-	       ipkg_message(conf, IPKG_DEBUG, "   replacement_apkg=%s for provider_apkg=%s\n", 
-			    replacement_apkg->name, provider_apkg->name);
-
-	  if (replacement_apkg && (replacement_apkg != provider_apkg)) {
-	       if (abstract_pkg_vec_contains(providers, replacement_apkg))
-		    continue;
-	       else
-		    provider_apkg = replacement_apkg;
-	  }
-
-	  if (!(vec = provider_apkg->pkgs)) {
-	       ipkg_message(conf, IPKG_DEBUG, "   no pkgs for provider_apkg %s\n", provider_apkg->name);
-	       continue;
-	  }
-    
-
-	  /* now check for supported architecture */
-	  {
-	       int max_count = 0;
-	       int i;
-
-	       /* count packages matching max arch priority and keep track of last one */
-	       for (i = 0; i < vec->len; i++) {
-		    pkg_t *maybe = vec->pkgs[i];
-		    ipkg_message(conf, IPKG_DEBUG, "  %s arch=%s arch_priority=%d version=%s  \n",
-				 maybe->name, maybe->architecture, maybe->arch_priority, maybe->version);
-		    if (maybe->arch_priority > 0)  {
-			 max_count++;
-			 abstract_pkg_vec_insert(matching_apkgs, maybe->parent);
-			 pkg_vec_insert(matching_pkgs, maybe);
-		    }
-	       }
-	  }
-     }
-
-     if (matching_pkgs->len > 1)
-	  pkg_vec_sort(matching_pkgs, pkg_name_version_and_architecture_compare);
-     if (matching_apkgs->len > 1)
-	  abstract_pkg_vec_sort(matching_pkgs, abstract_pkg_name_compare);
-
-/* Here it is usefull, if ( matching_apkgs->len > 1 ), to test if one of this matching packages has the same name of the
-   needed package. In this case, I would return it for install, otherwise I will continue with the procedure */
-/* The problem is what to do when there are more than a mathing package, with the same name and several version ?
-   Until now I always got the latest, but that breaks the downgrade option.
-   If I stop at the first one, I would probably miss the new ones 
-   Maybe the way is to have some kind of flag somewhere, to see if the package been asked to install is from a file,
-   or from a Packages feed.
-   It it is from a file it always need to be checked whatever version I have in feeds or everywhere, according to force-down or whatever options*/
-/*Pigi*/
-
-     for (i = 0; i < matching_pkgs->len; i++) {
-	  pkg_t *matching = matching_pkgs->pkgs[i];
-          if (constraint_fcn(matching, cdata)) {  /* We found it */
-             ipkg_message(conf, IPKG_DEBUG, " Found a valid candidate for the install: %s %s  \n", matching->name, matching->version) ;
-             good_pkg_by_name = matching;
-             if ( matching->provided_by_hand == 1 )    /* It has been provided by hand, so it is what user want */
-                break;                                 
-          }
-     }
-
-
-     for (i = 0; i < matching_pkgs->len; i++) {
-	  pkg_t *matching = matching_pkgs->pkgs[i];
-	  latest_matching = matching;
-	  if (matching->parent->state_status == SS_INSTALLED || matching->parent->state_status == SS_UNPACKED)
-	       latest_installed_parent = matching;
-	  if (matching->state_flag & (SF_HOLD|SF_PREFER)) {
-	       if (held_pkg)
-		    ipkg_message(conf, IPKG_ERROR, "Multiple packages (%s and %s) providing same name marked HOLD or PREFER.  Using latest.\n",
-				 held_pkg->name, matching->name);
-	       held_pkg = matching;
-	  }
-     }
-
-     if (!good_pkg_by_name && !held_pkg && !latest_installed_parent && matching_apkgs->len > 1 && !quiet) {
-	  ipkg_message(conf, IPKG_ERROR, "Package=%s, %d matching providers\n",
-		       apkg->name, matching_apkgs->len);
-	  for (i = 0; i < matching_apkgs->len; i++) {
-              abstract_pkg_t *matching = matching_apkgs->pkgs[i];
-              ipkg_message(conf, IPKG_ERROR, "    %s\n", matching->name);
-	  }
-	  ipkg_message(conf, IPKG_ERROR, "Please select one with ipkg install or ipkg flag prefer\n");
-     }
-
-     if (matching_apkgs->len > 1 && conf->verbosity > 1) {
-	  ipkg_message(conf, IPKG_NOTICE, "%s: for apkg=%s, %d matching pkgs\n",
-		       __FUNCTION__, apkg->name, matching_pkgs->len);
-	  for (i = 0; i < matching_pkgs->len; i++) {
-	       pkg_t *matching = matching_pkgs->pkgs[i];
-	       ipkg_message(conf, IPKG_INFO, "    %s %s %s\n",
-			    matching->name, matching->version, matching->architecture);
-	  }
-     }
-
-     nmatching = matching_apkgs->len;
-
-     pkg_vec_free(matching_pkgs);
-     abstract_pkg_vec_free(matching_apkgs);
-     abstract_pkg_vec_free(providers);
-
-     if (good_pkg_by_name) {   /* We found a good candidate, we will install it */ 
-	  return good_pkg_by_name;
-     }
-     if (held_pkg) {
-	  ipkg_message(conf, IPKG_INFO, "  using held package %s\n", held_pkg->name);
-	  return held_pkg;
-     }
-     if (latest_installed_parent) {
-	  ipkg_message(conf, IPKG_INFO, "  using latest version of installed package %s\n", latest_installed_parent->name);
-	  return latest_installed_parent;
-     }
-     if (nmatching > 1) {
-	  ipkg_message(conf, IPKG_INFO, "  no matching pkg out of matching_apkgs=%d\n", nmatching);
-	  return NULL;
-     }
-     if (latest_matching) {
-	  ipkg_message(conf, IPKG_INFO, "  using latest matching %s %s %s\n",
-		       latest_matching->name, latest_matching->version, latest_matching->architecture);
-	  return latest_matching;
-     }
-     return NULL;
-}
-
-static int pkg_name_constraint_fcn(pkg_t *pkg, void *cdata)
-{
-     const char *name = (const char *)cdata;
-     if (strcmp(pkg->name, name) == 0)
-	  return 1;
-     else
-	  return 0;   
-}
-
-pkg_t *pkg_hash_fetch_best_installation_candidate_by_name(ipkg_conf_t *conf, const char *name)
-{
-     hash_table_t *hash = &conf->pkg_hash;
-     abstract_pkg_t *apkg = NULL;
-
-     if (!(apkg = abstract_pkg_fetch_by_name(hash, name)))
-	  return NULL;
-     
-     return pkg_hash_fetch_best_installation_candidate(conf, apkg, pkg_name_constraint_fcn, apkg->name, 0);
-}
-
-
-pkg_t * pkg_hash_fetch_by_name_version(hash_table_t *hash, 
-				       const char *pkg_name,
-				       const char * version)
-{
-    pkg_vec_t * vec;
-    register int i;
-    char *version_str = NULL;
-    
-    if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name)))
-	return NULL;
-    
-    for(i = 0; i < vec->len; i++) {
-	version_str = pkg_version_str_alloc(vec->pkgs[i]);
-	if(!strcmp(version_str, version)) {
-	    free(version_str);
-	    break;
-	}
-	free(version_str);
-    }
-	
-    if(i == vec->len)
-	return NULL;
-    
-    return vec->pkgs[i];
-}
-
-pkg_t *pkg_hash_fetch_installed_by_name_dest(hash_table_t *hash,
-					     const char *pkg_name,
-					     pkg_dest_t *dest)
-{
-    pkg_vec_t * vec;
-    register int i;
-
-    if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name))) {
-	return NULL;
-    }
-    
-    for(i = 0; i < vec->len; i++)
-	if((vec->pkgs[i]->state_status == SS_INSTALLED || vec->pkgs[i]->state_status == SS_UNPACKED) && vec->pkgs[i]->dest == dest) {
-	    return vec->pkgs[i];
-        }
-    return NULL;
-}
-
-pkg_t *pkg_hash_fetch_installed_by_name(hash_table_t *hash,
-					const char *pkg_name)
-{
-    pkg_vec_t * vec;
-    register int i;
-
-    if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name))){
-	return NULL;
-    } 
-
-    for(i = 0; i < vec->len; i++)
-	if (vec->pkgs[i]->state_status == SS_INSTALLED || vec->pkgs[i]->state_status == SS_UNPACKED){
-	    return vec->pkgs[i];
-        } 
-    
-    return NULL;
-}
-
-pkg_vec_t *pkg_vec_fetch_by_name(hash_table_t *hash, const char *pkg_name)
-{
-    abstract_pkg_t * ab_pkg;
-
-    if(!(ab_pkg = abstract_pkg_fetch_by_name(hash, pkg_name))){
-       return NULL;
-    }
-    
-    if (ab_pkg->pkgs) {
-      return ab_pkg->pkgs;
-    } else if (ab_pkg->provided_by) {
-      abstract_pkg_t *abpkg =  abstract_pkg_vec_get(ab_pkg->provided_by, 0);
-      if (abpkg != NULL){
-	  return abpkg->pkgs;
-      } else {
-	  return ab_pkg->pkgs;
-      }
-    } else {
-      return NULL;
-    }
-}
-
-static int pkg_compare_names(const void *p1, const void *p2)
-{
-  const pkg_t *pkg1 = *(const pkg_t **)p1;
-  const pkg_t *pkg2 = *(const pkg_t **)p2;
-  if (pkg1->name == NULL)
-    return 1;
-  if (pkg2->name == NULL)
-    return -1;
-  return(strcmp(pkg1->name, pkg2->name));
-}
-
-
-static void pkg_hash_fetch_available_helper(const char *pkg_name, void *entry, void *data)
-{
-  int j;
-  abstract_pkg_t *ab_pkg = (abstract_pkg_t *)entry;
-  pkg_vec_t *all = (pkg_vec_t *)data;
-  pkg_vec_t *pkg_vec = ab_pkg->pkgs;
-  if (pkg_vec) {
-    for (j = 0; j < pkg_vec->len; j++) {
-      pkg_t *pkg = pkg_vec->pkgs[j];
-      pkg_vec_insert(all, pkg);
-    }
-  }
-}
-
-void pkg_hash_fetch_available(hash_table_t *hash, pkg_vec_t *all)
-{
-    hash_table_foreach(hash, pkg_hash_fetch_available_helper, all);
-    qsort(all->pkgs, all->len, sizeof(pkg_t *), pkg_compare_names);
-}
-
-static void pkg_hash_fetch_all_installed_helper(const char *pkg_name, void *entry, void *data)
-{
-  abstract_pkg_t *ab_pkg = (abstract_pkg_t *)entry;
-  pkg_vec_t *all = (pkg_vec_t *)data;
-  pkg_vec_t *pkg_vec = ab_pkg->pkgs;
-  int j;
-  if (pkg_vec) {
-    for (j = 0; j < pkg_vec->len; j++) {
-      pkg_t *pkg = pkg_vec->pkgs[j];
-      if (pkg->state_status == SS_INSTALLED || pkg->state_status == SS_UNPACKED) {
-	pkg_vec_insert(all, pkg);
-      }
-    }
-  }
-}
-void pkg_hash_fetch_all_installed(hash_table_t *hash, pkg_vec_t *all)
-{
-    hash_table_foreach(hash, pkg_hash_fetch_all_installed_helper, all);
-    qsort(all->pkgs, all->len, sizeof(void*), pkg_compare_names);
-}
-
-static void pkg_hash_dump_helper(const char *pkg_name, void *entry, void *data)
-{
-  int i;
-  pkg_t *pkg;
-  abstract_pkg_t *ab_pkg = (abstract_pkg_t *)entry;
-  ipkg_conf_t *conf = (ipkg_conf_t *)data;
-  abstract_pkg_t ** dependents = ab_pkg->depended_upon_by;
-  fprintf(stdout, "%s\n", ab_pkg->name);
-  i = 0;
-  if (dependents != NULL)
-    while (dependents [i] != NULL)
-      printf ("\tdepended upon by - %s\n", dependents [i ++]->name);
-  dependents = ab_pkg->provided_by->pkgs;
-  i = 0;
-  if (dependents != NULL)
-    while (dependents [i] != NULL && i < ab_pkg->provided_by->len)
-      printf ("\tprovided by - %s\n", dependents [i ++]->name);
-  pkg = pkg_hash_fetch_best_installation_candidate_by_name (conf, ab_pkg->name);
-  if (pkg) {
-    i = 0;
-    while (i < pkg->depends_count)
-      printf ("\tdepends on - %s\n", pkg->depends_str [i ++]);	
-  }
-}
-void pkg_hash_dump(hash_table_t *hash, void *data)
-{
-
-  printf ("\n\n+=+%s+=+\n\n", __FUNCTION__);
-  hash_table_foreach(hash, pkg_hash_dump_helper, data);
-  printf ("\n+=+%s+=+\n\n", __FUNCTION__);    
-}
-
-abstract_pkg_t * ensure_abstract_pkg_by_name(hash_table_t * hash, const char * pkg_name)
-{
-  abstract_pkg_t * ab_pkg;
-
-  if(!(ab_pkg = abstract_pkg_fetch_by_name(hash, pkg_name)))
-    ab_pkg = add_new_abstract_pkg_by_name(hash, pkg_name);
-
-  return ab_pkg;
-}
-
-pkg_t *hash_insert_pkg(hash_table_t *hash, pkg_t *pkg, int set_status,ipkg_conf_t *conf)
-{
-     abstract_pkg_t * ab_pkg;
-     int arch_priority;
-
-     if(!pkg)
-	  return pkg;
-
-     arch_priority = pkg->arch_priority;
-
-     if (buildDepends(hash, pkg)<0){
-        fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__);
-        return NULL;
-     }
-     ab_pkg = ensure_abstract_pkg_by_name(hash, pkg->name);
-
-     if (set_status) {
-	  if (pkg->state_status == SS_INSTALLED) {
-	       ab_pkg->state_status = SS_INSTALLED;
-	  } else if (pkg->state_status == SS_UNPACKED) {
-	       ab_pkg->state_status = SS_UNPACKED;
-	  }
-     }
-
-     if(!ab_pkg->pkgs)
-	  ab_pkg->pkgs = pkg_vec_alloc();
-    
-     /* pkg_vec_insert_merge might munge package, but it returns an unmunged pkg */
-     pkg = pkg_vec_insert_merge(ab_pkg->pkgs, pkg, set_status,conf );
-     pkg->parent = ab_pkg;
-
-     if (buildProvides(hash, ab_pkg, pkg)<0){
-        fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__);
-        return NULL;
-     }
-     /* need to build the conflicts graph before replaces for correct calculation of replaced_by relation */
-     if (buildConflicts(hash, ab_pkg, pkg)<0){
-        fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__);
-        return NULL;
-     }
-     if (buildReplaces(hash, ab_pkg, pkg)<0) {
-        fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__);
-        return NULL;
-     }
-    
-     buildDependedUponBy(pkg, ab_pkg);
-     return pkg;
-}
-
-/*
- * this will assume that we've already determined that
- * the abstract pkg doesn't exist, 'cause we should know these things...
- */
-static abstract_pkg_t * add_new_abstract_pkg_by_name(hash_table_t * hash, const char * pkg_name)
-{
-  abstract_pkg_t * ab_pkg;
-
-  ab_pkg = abstract_pkg_new();
-  if (ab_pkg == NULL) { return NULL; }
-
-  ab_pkg->name = strdup(pkg_name);
-  hash_table_insert(hash, pkg_name, ab_pkg);
-
-  return ab_pkg;
-}
-
-
-pkg_t *file_hash_get_file_owner(ipkg_conf_t *conf, const char *file_name)
-{
-     hash_table_t *file_hash = &conf->file_hash;
-
-     return hash_table_get(file_hash, file_name); 
-}
-
-int file_hash_set_file_owner(ipkg_conf_t *conf, const char *file_name, pkg_t *owning_pkg)
-{
-     hash_table_t *file_hash = &conf->file_hash;
-     pkg_t *old_owning_pkg = hash_table_get(file_hash, file_name);
-     int file_name_len = strlen(file_name);
-
-     if (file_name[file_name_len -1] == '/')
-	  return 0;
-
-     if (conf->offline_root) {
-	  int len = strlen(conf->offline_root);
-	  if (strncmp(file_name, conf->offline_root, len) == 0) {
-	       file_name += len;
-	  }
-     }
-
-     // ipkg_message(conf, IPKG_DEBUG2, "owning_pkg=%s filename=%s\n", owning_pkg->name, file_name);
-     hash_table_insert(file_hash, file_name, owning_pkg); 
-     if (old_owning_pkg) {
-	  str_list_remove_elt(old_owning_pkg->installed_files, file_name);
-	  /* mark this package to have its filelist written */
-	  old_owning_pkg->state_flag |= SF_FILELIST_CHANGED;
-	  owning_pkg->state_flag |= SF_FILELIST_CHANGED;
-     }
-     return 0;
-}
-
-

Copied: trunk/src/target/opkg/pkg_hash.c (from rev 3879, trunk/src/target/ipkg/pkg_hash.c)

Deleted: trunk/src/target/opkg/pkg_hash.h
===================================================================
--- trunk/src/target/ipkg/pkg_hash.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg_hash.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,61 +0,0 @@
-/* pkg_hash.h - the itsy package management system
-
-   Steven M. Ayer
-   
-   Copyright (C) 2002 Compaq Computer Corporation
-
-   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 PKG_HASH_H
-#define PKG_HASH_H
-
-#include "pkg.h"
-#include "pkg_vec.h"
-#include "hash_table.h"
-
-
-int pkg_hash_init(const char *name, hash_table_t *hash, int len);
-void pkg_hash_deinit(hash_table_t *hash);
-void pkg_hash_map(hash_table_t *hash, void (*f)(void *data, void *entry), void *data);
-
-void pkg_hash_dump(hash_table_t *hash, void *data);
-void pkg_hash_fetch_available(hash_table_t *hash, pkg_vec_t *available);
-
-int pkg_hash_add_from_file(ipkg_conf_t *conf, const char *file_name,
-			   pkg_src_t *src, pkg_dest_t *dest, int is_status_file);
-pkg_t *hash_insert_pkg(hash_table_t *hash, pkg_t *pkg, int set_status,ipkg_conf_t *conf);
-
-abstract_pkg_t * ensure_abstract_pkg_by_name(hash_table_t * hash, const char * pkg_name);
-abstract_pkg_t * abstract_pkg_fetch_by_name(hash_table_t * hash, const char * pkg_name);
-pkg_vec_t *pkg_hash_fetch_by_name(hash_table_t *hash, const char *pkg_name);
-void pkg_hash_fetch_all_installed(hash_table_t *hash, pkg_vec_t *installed);
-pkg_t * pkg_hash_fetch_by_name_version(hash_table_t *hash, 
-				       const char *pkg_name,
-				       const char * version);
-abstract_pkg_vec_t *pkg_hash_fetch_all_installation_candidates(hash_table_t *hash, const char *name);
-pkg_t *pkg_hash_fetch_best_installation_candidate(ipkg_conf_t *conf, abstract_pkg_t *apkg, 
-						  int (*constraint_fcn)(pkg_t *pkg, void *data), void *cdata, int quiet);
-pkg_t *pkg_hash_fetch_best_installation_candidate_by_name(ipkg_conf_t *conf, const char *name);
-pkg_t *pkg_hash_fetch_installed_by_name(hash_table_t *hash,
-					const char *pkg_name);
-pkg_t *pkg_hash_fetch_installed_by_name_dest(hash_table_t *hash,
-					     const char *pkg_name,
-					     pkg_dest_t *dest);
-
-pkg_t *file_hash_get_file_owner(ipkg_conf_t *conf, const char *file_name);
-int file_hash_set_file_owner(ipkg_conf_t *conf, const char *file_name, pkg_t *pkg);
-
-/* XXX: shouldn't this go in pkg_vec.[ch]? */
-pkg_vec_t *pkg_vec_fetch_by_name(hash_table_t *hash, const char *pkg_name);
-
-#endif
-

Copied: trunk/src/target/opkg/pkg_hash.h (from rev 3879, trunk/src/target/ipkg/pkg_hash.h)

Deleted: trunk/src/target/opkg/pkg_parse.c
===================================================================
--- trunk/src/target/ipkg/pkg_parse.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg_parse.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,366 +0,0 @@
-/* pkg_parse.c - the itsy package management system
-
-   Steven M. Ayer
-   
-   Copyright (C) 2002 Compaq Computer Corporation
-
-   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 "ipkg.h"
-#include <errno.h>
-#include <ctype.h>
-   
-#include "pkg.h"
-#include "ipkg_utils.h"
-#include "pkg_parse.h"
-
-int isGenericFieldType(char * type, char * line)
-{
-    if(!strncmp(line, type, strlen(type)))
-	return 1;
-    return 0;
-}
-
-char * parseGenericFieldType(char * type, char * raw)
-{
-    char * field_value = raw + (strlen(type) + 1);
-    return trim_alloc(field_value);
-}
-
-void parseStatus(pkg_t *pkg, char * raw)
-{
-    char sw_str[64], sf_str[64], ss_str[64];
-
-    sscanf(raw, "Status: %s %s %s", sw_str, sf_str, ss_str);
-    pkg->state_want = pkg_state_want_from_str(sw_str);
-    pkg->state_flag = pkg_state_flag_from_str(sf_str);
-    pkg->state_status = pkg_state_status_from_str(ss_str);
-}
-
-char ** parseDependsString(char * raw, int * depends_count)
-{
-    char ** depends = NULL;
-    int line_count = 0;
-    char buff[2048], * dest;
-
-    while(raw && *raw && !isspace(*raw)) {
-	raw++;
-    }
-
-    if(line_is_blank(raw)){
-	*depends_count = line_count;
-	return NULL;
-    }
-    while(raw && *raw){
-	depends = (char **)realloc(depends, sizeof(char *) * (line_count + 1));
-	
-	while(isspace(*raw)) raw++;
-
-	dest = buff;
-	while((*raw != ',') && *raw)
-	    *dest++ = *raw++;
-
-	*dest = '\0';
-	depends[line_count] = trim_alloc(buff);
-	if(depends[line_count] ==NULL)
-	   return NULL;
-        line_count++;
-	if(*raw == ',')
-	    raw++;
-    }
-    *depends_count = line_count;
-    return depends;
-}
-
-void parseConffiles(pkg_t * pkg, char * raw)
-{
-    char file_name[1048], md5sum[1048];  /* please tell me there aren't any longer that 1k */
-
-    if(!strncmp(raw, "Conffiles:", 10))
-	raw += strlen("Conffiles:");
-
-    while(*raw && (sscanf(raw, "%s%s", file_name, md5sum) == 2)){
-	conffile_list_append(&pkg->conffiles, file_name, md5sum);
-	/*	fprintf(stderr, "%s %s ", file_name, md5sum);*/
-	while (*raw && isspace(*raw)) {
-	    raw++;
-	}
-	raw += strlen(file_name);
-	while (*raw && isspace(*raw)) {
-	    raw++;
-	}
-	raw += strlen(md5sum);
-    }
-}    
-
-int parseVersion(pkg_t *pkg, char *raw)
-{
-  char *colon, *eepochcolon;
-#ifdef USE_DEBVERSION
-  char *hyphen;
-#endif
-  unsigned long epoch;
-
-  if (!*raw) {
-      fprintf(stderr, "%s: ERROR: version string is empty", __FUNCTION__);
-      return EINVAL;
-  }
-
-  if (strncmp(raw, "Version:", 8) == 0) {
-      raw += 8;
-  }
-  while (*raw && isspace(*raw)) {
-      raw++;
-  }
-  
-  colon= strchr(raw,':');
-  if (colon) {
-    epoch= strtoul(raw,&eepochcolon,10);
-    if (colon != eepochcolon) {
-	fprintf(stderr, "%s: ERROR: epoch in version is not number", __FUNCTION__);
-	return EINVAL;
-    }
-    if (!*++colon) {
-	fprintf(stderr, "%s: ERROR: nothing after colon in version number", __FUNCTION__);
-	return EINVAL;
-    }
-    raw= colon;
-    pkg->epoch= epoch;
-  } else {
-    pkg->epoch= 0;
-  }
-
-  pkg->revision = "";
-  pkg->familiar_revision = "";
-
-  pkg->version= malloc(strlen(raw)+1);
-  if ( pkg->version == NULL ) {
-     fprintf(stderr, "%s: out of memory \n", __FUNCTION__);
-     return ENOMEM;
-  }
-  strcpy(pkg->version, raw);
-
-#ifdef USE_DEBVERSION
-  hyphen= strrchr(pkg->version,'-');
-
-  if (hyphen) {
-    *hyphen++= 0;
-    if (strncmp("fam", hyphen, 3) == 0) {
-      pkg->familiar_revision=hyphen+3;
-      hyphen= strrchr(pkg->version,'-');
-      if (hyphen) {
-	*hyphen++= 0;
-	pkg->revision = hyphen;
-      }
-    } else {
-      pkg->revision = hyphen;
-    }
-  }
-#endif
-
-/*
-  fprintf(stderr,"Parsed version: %lu, %s, %s, %s\n",
-	  pkg->epoch,
-	  pkg->version,
-	  pkg->revision,
-	  pkg->familiar_revision);
-*/
-	  
-  return 0;
-}
-
-
-/* This code is needed to insert in first position the keyword for the aligning bug */
-
-int alterProvidesLine(char *raw, char *temp)
-{
-
-
-  if (!*raw) {
-      fprintf(stderr, "%s: ERROR: Provides string is empty", __FUNCTION__);
-      return -EINVAL;
-  }
-
-  if ( temp == NULL ) {
-     fprintf(stderr, "%s: out of memory \n", __FUNCTION__);
-     return -ENOMEM;
-  }
-
-  if (strncmp(raw, "Provides:", 9) == 0) {
-      raw += 9;
-  }
-  while (*raw && isspace(*raw)) {
-      raw++;
-  }      
-  
-  snprintf ( temp, 35, "Provides: ipkg_internal_use_only, ");           /* First part of the line */
-  while (*raw) {
-     strncat( temp, raw++, 1);
-  }
-  return 0;
- 
-}
-
-/* Some random thoughts from Carl:
-
-   This function could be considerably simplified if we just kept
-   an array of all the generic string-valued field names, and looped
-   through those looking for a match. Also, these fields could perhaps
-   be stored in the package as an array as well, (or, probably better,
-   as an nv_pair_list_t).
-
-   Fields which require special parsing or storage, (such as Depends:
-   and Status:) could be handled as they are now. 
-*/
-/* XXX: FEATURE: The Suggests: field needs to be changed from a string
-   to a dependency list. And, since we already have
-   Depends/Pre-Depends and need to add Conflicts, Recommends, and
-   Enhances, perhaps we could generalize all of these and save some
-   code duplication.
-*/
-int pkg_parse_raw(pkg_t *pkg, char ***raw, pkg_src_t *src, pkg_dest_t *dest)
-{
-    int reading_conffiles, reading_description;
-    int pkg_false_provides=1;
-    char ** lines;
-    char * provide=NULL;
-
-    pkg->src = src;
-    pkg->dest = dest;
-
-    reading_conffiles = reading_description = 0;
-
-    for (lines = *raw; *lines; lines++) {
-	/*	fprintf(stderr, "PARSING %s\n", *lines);*/
-	if(isGenericFieldType("Package:", *lines)) 
-	    pkg->name = parseGenericFieldType("Package", *lines);
-	else if(isGenericFieldType("Architecture:", *lines))
-	    pkg->architecture = parseGenericFieldType("Architecture", *lines);
-	else if(isGenericFieldType("Filename:", *lines))
-	    pkg->filename = parseGenericFieldType("Filename", *lines);
-	else if(isGenericFieldType("Section:", *lines))
-	    pkg->section = parseGenericFieldType("Section", *lines);
-	else if(isGenericFieldType("MD5sum:", *lines))
-	    pkg->md5sum = parseGenericFieldType("MD5sum", *lines);
-	/* The old ipkg wrote out status files with the wrong case for MD5sum,
-	   let's parse it either way */
-	else if(isGenericFieldType("MD5Sum:", *lines))
-	    pkg->md5sum = parseGenericFieldType("MD5Sum", *lines);
-	else if(isGenericFieldType("Size:", *lines))
-	    pkg->size = parseGenericFieldType("Size", *lines);
-	else if(isGenericFieldType("Source:", *lines))
-	    pkg->source = parseGenericFieldType("Source", *lines);
-	else if(isGenericFieldType("Installed-Size:", *lines))
-	    pkg->installed_size = parseGenericFieldType("Installed-Size", *lines);
-	else if(isGenericFieldType("Installed-Time:", *lines)) {
-	     char *time_str = parseGenericFieldType("Installed-Time", *lines);
-	     pkg->installed_time = strtoul(time_str, NULL, 0);
-	} else if(isGenericFieldType("Priority:", *lines))
-	    pkg->priority = parseGenericFieldType("Priority", *lines);
-	else if(isGenericFieldType("Essential:", *lines)) {
-	    char *essential_value;
-	    essential_value = parseGenericFieldType("Essential", *lines);
-	    if (strcmp(essential_value, "yes") == 0) {
-		pkg->essential = 1;
-	    }
-	    free(essential_value);
-	}
-	else if(isGenericFieldType("Status", *lines))
-	    parseStatus(pkg, *lines);
-	else if(isGenericFieldType("Version", *lines))
-	    parseVersion(pkg, *lines);
-	else if(isGenericFieldType("Maintainer", *lines))
-	    pkg->maintainer = parseGenericFieldType("Maintainer", *lines);
-	else if(isGenericFieldType("Conffiles", *lines)){
-	    parseConffiles(pkg, *lines);
-	    reading_conffiles = 1;
-	}
-	else if(isGenericFieldType("Description", *lines)) {
-	    pkg->description = parseGenericFieldType("Description", *lines);
-	    reading_conffiles = 0;
-	    reading_description = 1;
-	}
-
-	else if(isGenericFieldType("Provides", *lines)){
-/* Here we add the internal_use to align the off by one problem between provides_str and provides */
-            provide = (char * ) malloc(strlen(*lines)+ 35 ); /* Preparing the space for the new ipkg_internal_use_only */
-            if ( alterProvidesLine(*lines,provide) ){
-               return EINVAL;
-            }
-	    pkg->provides_str = parseDependsString( provide, &pkg->provides_count);
-/* Let's try to hack a bit here.
-   The idea is that if a package has no Provides, we would add one generic, to permit the check of dependencies
-   in alot of other places. We will remove it before writing down the status database */
-            pkg_false_provides=0;
-            free(provide);
-        } 
-
-	else if(isGenericFieldType("Depends", *lines))
-	    pkg->depends_str = parseDependsString(*lines, &pkg->depends_count);
-	else if(isGenericFieldType("Pre-Depends", *lines))
-	    pkg->pre_depends_str = parseDependsString(*lines, &pkg->pre_depends_count);
-	else if(isGenericFieldType("Recommends", *lines))
-	    pkg->recommends_str = parseDependsString(*lines, &pkg->recommends_count);
-	else if(isGenericFieldType("Suggests", *lines))
-	    pkg->suggests_str = parseDependsString(*lines, &pkg->suggests_count);
-	/* Abhaya: support for conflicts */
-	else if(isGenericFieldType("Conflicts", *lines))
-	    pkg->conflicts_str = parseDependsString(*lines, &pkg->conflicts_count);
-	else if(isGenericFieldType("Replaces", *lines))
-	    pkg->replaces_str = parseDependsString(*lines, &pkg->replaces_count);
-	else if(line_is_blank(*lines)) {
-	    lines++;
-	    break;
-	}
-	else if(**lines == ' '){
-	    if(reading_description) {
-		/* we already know it's not blank, so the rest of description */      
-		pkg->description = realloc(pkg->description,
-					   strlen(pkg->description)
-					   + 1 + strlen(*lines) + 1);
-		strcat(pkg->description, "\n");
-		strcat(pkg->description, (*lines));
-	    }
-	    else if(reading_conffiles)
-		parseConffiles(pkg, *lines);
-	}
-    }
-    *raw = lines;
-/* If the ipk has not a Provides line, we insert our false line */ 
-    if ( pkg_false_provides==1)
-       pkg->provides_str = parseDependsString ((char *)"Provides: ipkg_internal_use_only ", &pkg->provides_count);
-
-    if (pkg->name) {
-	return 0;
-    } else {
-	return EINVAL;
-    }
-}
-
-int pkg_valorize_other_field(pkg_t *pkg, char ***raw)
-{
-    char ** lines;
-
-    for (lines = *raw; *lines; lines++) {
-	if(isGenericFieldType("Essential:", *lines)) {
-	    char *essential_value;
-	    essential_value = parseGenericFieldType("Essential", *lines);
-	    if (strcmp(essential_value, "yes") == 0) {
-		pkg->essential = 1;
-	    }
-	    free(essential_value);
-	}
-    }
-    *raw = lines;
-
-    return 0;
-}

Copied: trunk/src/target/opkg/pkg_parse.c (from rev 3879, trunk/src/target/ipkg/pkg_parse.c)

Deleted: trunk/src/target/opkg/pkg_src.c
===================================================================
--- trunk/src/target/ipkg/pkg_src.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg_src.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,43 +0,0 @@
-/* pkg_src.c - 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.
-*/
-
-#include "ipkg.h"
-
-#include "pkg_src.h"
-#include "str_util.h"
-
-int pkg_src_init(pkg_src_t *src, const char *name, const char *base_url, const char *extra_data, int gzip)
-{
-    src->gzip = gzip;
-    src->name = str_dup_safe (name);
-    src->value = str_dup_safe (base_url);
-    if (extra_data)
-	src->extra_data = str_dup_safe (extra_data);
-    else
-	src->extra_data = NULL;
-    return 0;
-}
-
-void pkg_src_deinit(pkg_src_t *src)
-{
-    free (src->name);
-    free (src->value);
-    if (src->extra_data)
-	free (src->extra_data);
-}
-
-

Copied: trunk/src/target/opkg/pkg_src.c (from rev 3879, trunk/src/target/ipkg/pkg_src.c)

Deleted: trunk/src/target/opkg/pkg_src_list.c
===================================================================
--- trunk/src/target/ipkg/pkg_src_list.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg_src_list.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,75 +0,0 @@
-/* pkg_src_list.c - 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.
-*/
-
-#include "ipkg.h"
-
-#include "pkg_src_list.h"
-#include "void_list.h"
-
-int pkg_src_list_init(pkg_src_list_t *list)
-{
-    return void_list_init((void_list_t *) list);
-}
-
-void pkg_src_list_deinit(pkg_src_list_t *list)
-{
-    pkg_src_list_elt_t *iter;
-    pkg_src_t *pkg_src;
-
-    for (iter = list->head; iter; iter = iter->next) {
-      pkg_src = iter->data;
-      pkg_src_deinit(pkg_src);
-
-      /* malloced in pkg_src_list_append */
-      free(pkg_src);
-      iter->data = NULL;
-    }
-    void_list_deinit((void_list_t *) list);
-}
-
-pkg_src_t *pkg_src_list_append(pkg_src_list_t *list,
-			       const char *name, const char *base_url, const char *extra_data,
-			       int gzip)
-{
-    int err;
-
-    /* freed in pkg_src_list_deinit */
-    pkg_src_t *pkg_src = malloc(sizeof(pkg_src_t));
-
-    if (pkg_src == NULL) {
-	fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	return NULL;
-    }
-    pkg_src_init(pkg_src, name, base_url, extra_data, gzip);
-
-    err = void_list_append((void_list_t *) list, pkg_src);
-    if (err) {
-	return NULL;
-    }
-
-    return pkg_src;
-}
-
-int pkg_src_list_push(pkg_src_list_t *list, pkg_src_t *data)
-{
-    return void_list_push((void_list_t *) list, data);
-}
-
-pkg_src_list_elt_t *pkg_src_list_pop(pkg_src_list_t *list)
-{
-    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
-}

Copied: trunk/src/target/opkg/pkg_src_list.c (from rev 3879, trunk/src/target/ipkg/pkg_src_list.c)

Deleted: trunk/src/target/opkg/pkg_vec.c
===================================================================
--- trunk/src/target/ipkg/pkg_vec.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg_vec.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,230 +0,0 @@
-/* pkg_vec.c - the itsy package management system
-
-   Steven M. Ayer
-   
-   Copyright (C) 2002 Compaq Computer Corporation
-
-   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 <stdlib.h>
-#include <fnmatch.h>
-#include "xregex.h"
-#include "ipkg.h"
-#include "pkg.h"
-
-pkg_vec_t * pkg_vec_alloc(void)
-{
-    pkg_vec_t * vec = (pkg_vec_t *)malloc(sizeof(pkg_vec_t));
-    if (!vec) {
-      fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-      return NULL;
-    }
-    vec->pkgs = NULL;
-    vec->len = 0;
-
-    return vec;
-}
-
-void pkg_vec_free(pkg_vec_t *vec)
-{
-    free(vec->pkgs);
-    free(vec);
-}
-
-/*
- * assumption: all names in a vector are identical
- * assumption: all version strings are trimmed,
- *             so identical versions have identical version strings,
- *             implying identical packages; let's marry these
- */
-pkg_t *pkg_vec_insert_merge(pkg_vec_t *vec, pkg_t *pkg, int set_status,ipkg_conf_t *conf)
-{
-     int i;
-     int found = 0;
-
-     /* look for a duplicate pkg by name, version, and architecture */
-     for (i = 0; i < vec->len; i++){
-         ipkg_message(conf, IPKG_DEBUG2, "Function: %s. Found pkg=%s version=%s arch=%s cmp=%s version=%s arch=%s \n", 
-                      __FUNCTION__, pkg->name, pkg->version, pkg->architecture, 
-                       vec->pkgs[i]->name, vec->pkgs[i]->version,vec->pkgs[i]->architecture );
-	  if ((strcmp(pkg->name, vec->pkgs[i]->name) == 0)
-	      && (pkg_compare_versions(pkg, vec->pkgs[i]) == 0)
-	      && (strcmp(pkg->architecture, vec->pkgs[i]->architecture) == 0)) {
-	       found  = 1;
-               ipkg_message(conf, IPKG_DEBUG2, "Function: %s. Found duplicate for pkg=%s version=%s arch=%s\n",
-                             __FUNCTION__, pkg->name, pkg->version, pkg->architecture);
-	       break;
-	  }
-     }
-
-     /* we didn't find one, add it */
-     if (!found){   
-         ipkg_message(conf, IPKG_DEBUG2, "Function: %s. Adding new pkg=%s version=%s arch=%s\n",
-                      __FUNCTION__, pkg->name, pkg->version, pkg->architecture);
-
-	  vec->pkgs = (pkg_t **)realloc(vec->pkgs, (vec->len + 1) * sizeof(pkg_t *));
-	  vec->pkgs[vec->len] = pkg;
-	  vec->len++;
-	  return pkg;
-     }
-     /* update the one that we have */
-     else {
-          ipkg_message(conf, IPKG_DEBUG2, "Function: %s. calling pkg_merge for pkg=%s version=%s arch=%s",
-                        __FUNCTION__, pkg->name, pkg->version, pkg->architecture);
-	  if (set_status) {
-	       /* this is from the status file, so need to merge with existing database */
-               ipkg_message(conf, IPKG_DEBUG2, " with set_status\n");
-	       pkg_merge(vec->pkgs[i], pkg, set_status);
-	       /* XXX: CLEANUP: It's not so polite to free something here
-		  that was passed in from above. */
-	       pkg_deinit(pkg);
-	       free(pkg);
-	  } else {
-               ipkg_message(conf, IPKG_DEBUG2, " WITHOUT set_status\n");
-	       /* just overwrite the old one */
-	       pkg_deinit(vec->pkgs[i]);
-	       free(vec->pkgs[i]);
-	       vec->pkgs[i] = pkg;
-	  }
-	  return vec->pkgs[i];
-     }
-}
-
-void pkg_vec_insert(pkg_vec_t *vec, const pkg_t *pkg)
-{
-     int i;
-     int found = 0;
-
-     /* look for a duplicate pkg by name, version, and architecture */
-     for (i = 0; i < vec->len; i++)
-	  if ((strcmp(pkg->name, vec->pkgs[i]->name) == 0)
-	      && (pkg_compare_versions(pkg, vec->pkgs[i]) == 0)
-	      && (strcmp(pkg->architecture, vec->pkgs[i]->name) == 0)) {
-	       found = 1;
-	       break;
-	  }
-
-     /* we didn't find one, add it */
-     if(!found){   
-	  vec->pkgs = (pkg_t **)realloc(vec->pkgs, (vec->len + 1) * sizeof(pkg_t *));
-	  *(const pkg_t **)&vec->pkgs[vec->len] = pkg;
-	  vec->len++;
-     }
-}
-
-int pkg_vec_contains(pkg_vec_t *vec, pkg_t *apkg)
-{
-     int i;
-     for (i = 0; i < vec->len; i++)
-	  if (vec->pkgs[i] == apkg)
-	       return 1;
-     return 0;
-}
-
-typedef int (*compare_fcn_t)(const void *, const void *);
-void pkg_vec_sort(pkg_vec_t *vec, int (*compar)(pkg_t *, pkg_t *))
-{
-     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
-}
-
-int pkg_vec_clear_marks(pkg_vec_t *vec)
-{
-     int npkgs = vec->len;
-     int i;
-     for (i = 0; i < npkgs; i++) {
-	  pkg_t *pkg = vec->pkgs[i];
-	  pkg->state_flag &= ~SF_MARKED;
-     }
-     return 0;
-}
-
-int pkg_vec_mark_if_matches(pkg_vec_t *vec, const char *pattern)
-{
-     int matching_count = 0;
-     pkg_t **pkgs = vec->pkgs;
-     int npkgs = vec->len;
-     int i;
-     for (i = 0; i < npkgs; i++) {
-	  pkg_t *pkg = pkgs[i];
-	  if (fnmatch(pattern, pkg->name, 0)==0) {
-	       pkg->state_flag |= SF_MARKED;
-	       matching_count++;
-	  }
-     }
-     return matching_count;
-}
-
-
-abstract_pkg_vec_t * abstract_pkg_vec_alloc(void)
-{
-    abstract_pkg_vec_t * vec ; 
-    vec = (abstract_pkg_vec_t *)malloc(sizeof(abstract_pkg_vec_t));
-    if (!vec) {
-      fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-      return NULL;
-    }
-    vec->pkgs = NULL;
-    vec->len = 0;
-
-    return vec;
-}
-
-void abstract_pkg_vec_free(abstract_pkg_vec_t *vec)
-{
-    free(vec->pkgs);
-    free(vec);
-}
-
-/*
- * assumption: all names in a vector are unique
- */
-void abstract_pkg_vec_insert(abstract_pkg_vec_t *vec, abstract_pkg_t *pkg)
-{
-    int i;
-
-    /* look for a duplicate pkg by name */
-    for(i = 0; i < vec->len; i++)
-	if (strcmp(pkg->name, vec->pkgs[i]->name) == 0)
-	    break;
-
-    /* we didn't find one, add it */
-    if(i == vec->len){   
-	vec->pkgs = 
-	  (abstract_pkg_t **)
-	    realloc(vec->pkgs, (vec->len + 1) * sizeof(abstract_pkg_t *));
-	vec->pkgs[vec->len] = pkg;
-	vec->len++;
-    }
-}
-
-abstract_pkg_t * abstract_pkg_vec_get(abstract_pkg_vec_t *vec, int i)
-{
-    if (vec->len > i) 
-	return vec->pkgs[i];
-    else
-	return NULL;
-}
-
-int abstract_pkg_vec_contains(abstract_pkg_vec_t *vec, abstract_pkg_t *apkg)
-{
-     int i;
-     for (i = 0; i < vec->len; i++)
-	  if (vec->pkgs[i] == apkg)
-	       return 1;
-     return 0;
-}
-
-void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *))
-{
-     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
-}
-

Copied: trunk/src/target/opkg/pkg_vec.c (from rev 3879, trunk/src/target/ipkg/pkg_vec.c)

Deleted: trunk/src/target/opkg/pkg_vec.h
===================================================================
--- trunk/src/target/ipkg/pkg_vec.h	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/pkg_vec.h	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,62 +0,0 @@
-/* pkg_vec.h - the itsy package management system
-
-   Steven M. Ayer
-   
-   Copyright (C) 2002 Compaq Computer Corporation
-
-   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 PKG_VEC_H
-#define PKG_VEC_H
-
-typedef struct pkg pkg_t;
-typedef struct abstract_pkg abstract_pkg_t;
-
-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);
-void pkg_vec_free(pkg_vec_t *vec);
-void marry_two_packages(pkg_t * newpkg, pkg_t * oldpkg);
-
-void pkg_vec_add(pkg_vec_t *vec, pkg_t *pkg);
-/* pkg_vec_insert_merge: might munge pkg.
-*  returns the pkg that is in the pkg graph */
-pkg_t *pkg_vec_insert_merge(pkg_vec_t *vec, pkg_t *pkg, int set_status, ipkg_conf_t *conf);
-/* this one never munges pkg */
-void pkg_vec_insert(pkg_vec_t *vec, const pkg_t *pkg);
-int pkg_vec_contains(pkg_vec_t *vec, pkg_t *apkg);
-void pkg_vec_sort(pkg_vec_t *vec, int (*compar)(pkg_t *, pkg_t *));
-
-int pkg_vec_clear_marks(pkg_vec_t *vec);
-int pkg_vec_mark_if_matches(pkg_vec_t *vec, const char *pattern);
-
-abstract_pkg_vec_t * abstract_pkg_vec_alloc(void);
-void abstract_pkg_vec_free(abstract_pkg_vec_t *vec);
-void abstract_pkg_vec_insert(abstract_pkg_vec_t *vec, abstract_pkg_t *pkg);
-abstract_pkg_t * abstract_pkg_vec_get(abstract_pkg_vec_t *vec, int i);
-int abstract_pkg_vec_contains(abstract_pkg_vec_t *vec, abstract_pkg_t *apkg);
-void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
-#endif
-

Copied: trunk/src/target/opkg/pkg_vec.h (from rev 3879, trunk/src/target/ipkg/pkg_vec.h)

Deleted: trunk/src/target/opkg/sprintf_alloc.c
===================================================================
--- trunk/src/target/ipkg/sprintf_alloc.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/sprintf_alloc.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,73 +0,0 @@
-/* sprintf_alloc.c -- like sprintf with memory allocation
-
-   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.
-*/
-
-#include "ipkg.h"
-#include <stdarg.h>
-
-#include "sprintf_alloc.h"
-
-int sprintf_alloc(char **str, const char *fmt, ...)
-{
-    va_list ap;
-    char *new_str;
-    int n, size = 100;
-
-    if (!str) {
-      fprintf(stderr, "Null string pointer passed to sprintf_alloc\n");
-      return -1;
-    }
-    if (!fmt) {
-      fprintf(stderr, "Null fmt string passed to sprintf_alloc\n");
-      return -1;
-    }
-
-    /* On x86_64 systems, any strings over 100 were segfaulting.  
-       It seems that the ap needs to be reinitalized before every
-       use of the v*printf() functions. I pulled the functionality out
-       of vsprintf_alloc and combined it all here instead. 
-    */
-    
-
-    /* ripped more or less straight out of PRINTF(3) */
-
-    if ((new_str = malloc(size)) == NULL) 
-      return -1;
-
-    *str = new_str;
-    while(1) {
-      va_start(ap, fmt);
-      n = vsnprintf (new_str, size, fmt, ap);
-      va_end(ap);
-      /* If that worked, return the size. */
-      if (n > -1 && n < size)
-	return n;
-	/* Else try again with more space. */
-	if (n > -1)    /* glibc 2.1 */
-	    size = n+1; /* precisely what is needed */
-	else           /* glibc 2.0 */
-	    size *= 2;  /* twice the old size */
-	new_str = realloc(new_str, size);
-	if (new_str == NULL) {
-	    free(new_str);
-	    *str = NULL;
-	    return -1;
-	}
-	*str = new_str;
-    }
-
-    return -1; /* Just to be correct - it probably won't get here */
-}

Copied: trunk/src/target/opkg/sprintf_alloc.c (from rev 3879, trunk/src/target/ipkg/sprintf_alloc.c)

Deleted: trunk/src/target/opkg/str_list.c
===================================================================
--- trunk/src/target/ipkg/str_list.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/str_list.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,76 +0,0 @@
-/* str_list.c - 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.
-*/
-
-#include "ipkg.h"
-
-#include "str_list.h"
-
-int str_list_elt_init(str_list_elt_t *elt, char *data)
-{
-    return void_list_elt_init((void_list_elt_t *) elt, data);
-}
-
-void str_list_elt_deinit(str_list_elt_t *elt)
-{
-    void_list_elt_deinit((void_list_elt_t *) elt);
-}
-
-str_list_t *str_list_alloc()
-{
-     str_list_t *list = (str_list_t *)malloc(sizeof(str_list_t));
-     if (list)
-	  str_list_init(list);
-     return list;
-}
-
-int str_list_init(str_list_t *list)
-{
-    return void_list_init((void_list_t *) list);
-}
-
-void str_list_deinit(str_list_t *list)
-{
-    void_list_deinit((void_list_t *) list);
-}
-
-int str_list_append(str_list_t *list, char *data)
-{
-    return void_list_append((void_list_t *) list, data);
-}
-
-int str_list_push(str_list_t *list, char *data)
-{
-    return void_list_push((void_list_t *) list, data);
-}
-
-str_list_elt_t *str_list_pop(str_list_t *list)
-{
-    return (str_list_elt_t *) void_list_pop((void_list_t *) list);
-}
-
-str_list_elt_t *str_list_remove(str_list_t *list, str_list_elt_t **iter)
-{
-    return (str_list_elt_t *) void_list_remove((void_list_t *) list,
-					       (void_list_elt_t **) iter);
-}
-
-char *str_list_remove_elt(str_list_t *list, const char *target_str)
-{
-     return (char *)void_list_remove_elt((void_list_t *) list,
-					 (void *)target_str,
-					 (void_list_cmp_t)strcmp);
-}

Copied: trunk/src/target/opkg/str_list.c (from rev 3879, trunk/src/target/ipkg/str_list.c)

Deleted: trunk/src/target/opkg/str_util.c
===================================================================
--- trunk/src/target/ipkg/str_util.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/str_util.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,73 +0,0 @@
-/* str_utils.c - 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.
-*/
-
-#include "ipkg.h"
-
-int str_starts_with(const char *str, const char *prefix)
-{
-    return (strncmp(str, prefix, strlen(prefix)) == 0);
-}
-
-int str_ends_with(const char *str, const char *suffix)
-{
-    int suffix_len;
-    int str_len;
-
-    str_len = strlen(str);
-    suffix_len = strlen(suffix);
-
-    if (str_len < suffix_len) {
-	return 0;
-    }
-
-    return (strcmp(str + str_len - suffix_len, suffix) == 0);
-}
-
-int str_chomp(char *str)
-{
-    if (str[strlen(str) - 1] == '\n') {
-	str[strlen(str) - 1] = '\0';
-	return 1;
-    }
-    return 0;
-}
-
-int str_tolower(char *str)
-{
-    while (*str) {
-	*str = tolower(*str);
-	str++;
-    }
-
-    return 0;
-}
-
-int str_toupper(char *str)
-{
-    while (*str) {
-	*str = toupper(*str);
-	str++;
-    }
-
-    return 0;
-}
-
-char *str_dup_safe(const char *str)
-{
-    return str ? strdup(str) : NULL;
-}
-

Copied: trunk/src/target/opkg/str_util.c (from rev 3879, trunk/src/target/ipkg/str_util.c)

Deleted: trunk/src/target/opkg/update-alternatives
===================================================================
--- trunk/src/target/ipkg/update-alternatives	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/update-alternatives	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,189 +0,0 @@
-#!/bin/sh
-# update-alternatives
-#
-# Copyright (C) 2001 Carl D. Worth
-#
-# This program was inspired by the Debian update-alternatives program
-# which is Copyright (C) 1995 Ian Jackson. This version of
-# update-alternatives is command-line compatible with Debian's for a
-# subset of the options, (only --install, --remove, and --help)
-#
-# 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.
-
-set -e
-
-# admin dir
-ad="$IPKG_OFFLINE_ROOT/usr/lib/ipkg/alternatives"
-
-usage() {
-	echo "update-alternatives: $*
-
-Usage: update-alternatives --install <link> <name> <path> <priority>
-       update-alternatives --remove <name> <path>
-       update-alternatives --help
-<link> is the link pointing to the provided path (ie. /usr/bin/foo).
-<name> is the name in $ad/alternatives (ie. foo)
-<path> is the name referred to (ie. /usr/bin/foo-extra-spiffy)
-<priority> is an integer; options with higher numbers are chosen.
-" >&2
-	exit 2
-}
-
-quit() {
-	echo "update-alternatives: $*" >&2
-	exit 2
-}
-
-register_alt() {
-	[ $# -lt 2 ] && return 1
-	local name="$1"
-	local link="$2"
-
-	if [ ! -d $ad ]; then
-		mkdir -p $ad
-	fi
-
-	if [ -e "$ad/$name" ]; then
-		local olink=`head -n 1 $ad/$name`
-		if [ "$link" != "$olink" ]; then
-			echo "update-alternatives: Error: cannot register alternative $name to $link since it is already registered to $olink" >&2
-			return 1
-		fi
-	else
-		echo "$link" > "$ad/$name"
-	fi
-
-	return 0
-}
-
-protect_slashes() {
-	sed -e 's/\//\\\//g'
-}
-
-remove_alt() {
-	[ $# -lt 2 ] && return 1
-	local name="$1"
-	local path="$2"
-	
-	[ ! -f $ad/$name ] && return 0
-
-	path=`echo $path | protect_slashes`
-	sed -ne "/^$path\>.*/!p" $ad/$name > $ad/$name.new
-	mv $ad/$name.new $ad/$name
-}
-
-add_alt() {
-	[ $# -lt 3 ] && return 1
-	local name="$1"
-	local path="$2"
-	local priority="$3"
-	remove_alt $name $path
-	echo "$path $priority" >> $ad/$name
-}
-
-find_best_alt() {
-	[ $# -lt 1 ] && return 1
-	[ ! -f $ad/$name ] && return 0
-
-	link=$IPKG_OFFLINE_ROOT/`head -n 1 $ad/$name`
-
-##	path=`sed -ne "1!p" $ad/$name | sort -nr -k2 | head -1 | sed 's/ .*//'`
-## busybox safe:
-	path=`sed -ne "1!p" $ad/$name | sed -e "s/\(.*\) \(.*\)/\2 \1/g" | sort -nr | head -n 1 | sed 's/[^ ]* //'`
-	if [ -z "$path" ]; then
-		echo "update-alternatives: removing $link as no more alternatives exist for it"
-		rm $ad/$name
-		if [ -L $link ]; then
-			rm $link
-		fi
-		return 0
-	fi
-
-	if [ ! -e $link -o -L $link ]; then
-		local link_dir=`dirname $link`
-		if [ ! -d $link_dir ]; then
-			mkdir -p $link_dir
-		fi
-		ln -sf $path $link
-		echo "update-alternatives: Linking $link to $path"
-	else
-		echo "update-alternatives: Error: not linking $link to $path since $link exists and is not a link"
-		return 1
-	fi
-
-	return 0
-}
-
-do_install() {
-	if [ $# -lt 4 ]; then
-		usage "--install needs <link> <name> <path> <priority>"
-	fi
-	local link="$1"
-	local name="$2"
-	local path="$3"
-	local priority="$4"
-
-	path=`echo $path | sed 's|/\+|/|g'`
-
-	# This is a bad hack, but I haven't thought of a cleaner solution yet...
-	[ -n "$IPKG_OFFLINE_ROOT" ] && path=`echo $path | sed "s|^$IPKG_OFFLINE_ROOT/*|/|"`
-
-	register_alt $name $link
-	add_alt $name $path $priority
-	find_best_alt $name
-}
-
-do_remove() {
-       if [ $# -lt 2 ]; then
-		usage "--remove needs <name> <path>"
-	fi	
-	local name="$1"
-	local path="$2"
-
-	path=`echo $path | sed 's|/\+|/|g'`
-
-	# This is a bad hack, but I haven't thought of a cleaner solution yet...
-	[ -n "$IPKG_OFFLINE_ROOT" ] && path=`echo $path | sed "s|^$IPKG_OFFLINE_ROOT/*|/|"`
-
-	remove_alt $name $path
-	find_best_alt $name
-}
-
-###
-# update-alternatives "main"
-###
-
-while [ $# -gt 0 ]; do
-	arg="$1"
-	shift
-
-	case $arg in
-	--help)
-		usage "help:"
-		exit 0
-		;;
-	--install)
-		do_install $*
-		exit $?
-		;;
-	--remove)
-		do_remove $*
-		exit $?
-		;;
-	*)
-		usage "unknown argument \`$arg'"
-		;;
-	esac
-done
-
-usage "at least one of --install or --remove must appear"
-
-exit 0

Copied: trunk/src/target/opkg/update-alternatives (from rev 3879, trunk/src/target/ipkg/update-alternatives)

Deleted: trunk/src/target/opkg/user.c
===================================================================
--- trunk/src/target/ipkg/user.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/user.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,58 +0,0 @@
-/* user.c - the itsy package management system
-
-   Jamey Hicks
-
-   Copyright (C) 2002 Hewlett Packard Company
-   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.
-*/
-
-#include <stdio.h>
-#include <stdarg.h>
-#include "file_util.h"
-#include "str_util.h"
-#ifdef IPKG_LIB	
-#include "libipkg.h"
-#endif	
-
-
-#ifdef IPKG_LIB
-static char *question = NULL;
-static int question_len = 255;
-#endif	
-char *get_user_response(const char *format, ...)
-{
-     int len = question_len;
-     va_list ap;
-     char *response;
-     va_start(ap, format);
-
-#ifndef IPKG_LIB
-     vprintf(format, ap);
-     do {
-	  response = file_read_line_alloc(stdin);
-     } while (response == NULL);
-#else
-     do {
-	  if (question == NULL || len > question_len) {
-	       question = realloc(question, len + 1);
-	       question_len = len;
-	  }
-	  len = vsnprintf(question,question_len,format,ap);
-     } while (len > question_len);
-     response = strdup(ipkg_cb_response(question));
-#endif
-     str_chomp(response);
-     str_tolower(response);
-
-     return response;
-}

Copied: trunk/src/target/opkg/user.c (from rev 3879, trunk/src/target/ipkg/user.c)

Deleted: trunk/src/target/opkg/void_list.c
===================================================================
--- trunk/src/target/ipkg/void_list.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/void_list.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,194 +0,0 @@
-/* void_list.c - 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.
-*/
-
-#include "ipkg.h"
-#include <errno.h>
-
-#include "void_list.h"
-
-int void_list_elt_init(void_list_elt_t *elt, void *data)
-{
-    elt->next = NULL;
-    elt->data = data;
-
-    return 0;
-}
-
-void void_list_elt_deinit(void_list_elt_t *elt)
-{
-    void_list_elt_init(elt, NULL);
-}
-
-int void_list_init(void_list_t *list)
-{
-    void_list_elt_init(&list->pre_head, NULL);
-    list->head = NULL;
-    list->pre_head.next = list->head;
-    list->tail = NULL;
-
-    return 0;
-}
-
-void void_list_deinit(void_list_t *list)
-{
-    void_list_elt_t *elt;
-
-    while (list->head) {
-	elt = void_list_pop(list);
-	void_list_elt_deinit(elt);
-	/* malloced in void_list_append */
-	free(elt);
-    }
-}
-
-int void_list_append(void_list_t *list, void *data)
-{
-    void_list_elt_t *elt;
-
-    /* freed in void_list_deinit */
-    elt = malloc(sizeof(void_list_elt_t));
-    if (elt == NULL) {
-	fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	return ENOMEM;
-    }
-
-    void_list_elt_init(elt, data);
-
-    if (list->tail) {
-	list->tail->next = elt;
-	list->tail = elt;
-    } else {
-	list->head = elt;
-	list->pre_head.next = list->head;
-	list->tail = elt;
-    }
-
-    return 0;
-}
-
-int void_list_push(void_list_t *list, void *data)
-{
-    void_list_elt_t *elt;
-
-    elt = malloc(sizeof(void_list_elt_t));
-    if (elt == NULL) {
-	fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-	return ENOMEM;
-    }
-
-    void_list_elt_init(elt, data);
-
-    elt->next = list->head;
-    list->head->next = elt;
-    if (list->tail == NULL) {
-	list->tail = list->head;
-    }
-
-    return 0;
-}
-
-void_list_elt_t *void_list_pop(void_list_t *list)
-{
-    void_list_elt_t *elt;
-
-    elt = list->head;
-
-    if (list->head) {
-	list->head = list->head->next;
-	list->pre_head.next = list->head;
-	if (list->head == NULL) {
-	    list->tail = NULL;
-	}
-    }
-
-    return elt;
-}
-
-void *void_list_remove(void_list_t *list, void_list_elt_t **iter)
-{
-    void_list_elt_t *prior;
-    void_list_elt_t *old_elt;
-    void *old_data;
-
-    old_elt = *iter;
-    old_data = old_elt->data;
-
-    if (old_elt == list->head) {
-	prior = &list->pre_head;
-	void_list_pop(list);
-    } else {
-	for (prior = list->head; prior; prior = prior->next) {
-	    if (prior->next == old_elt) {
-		break;
-	    }
-	}
-	if (prior == NULL || prior->next != old_elt) {
-	    fprintf(stderr, "%s: ERROR: element not found in list\n", __FUNCTION__);
-	    return NULL;
-	}
-	prior->next = old_elt->next;
-
-	if (old_elt == list->tail) {
-	    list->tail = prior;
-	}
-    }
-
-    void_list_elt_deinit(old_elt);
-    *iter = prior;
-
-    return old_data;
-}
-
-/* remove element containing elt data, using cmp(elt->data, target_data) == 0. */
-void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp)
-{
-     void_list_elt_t *prior;
-     void_list_elt_t *old_elt = NULL;
-     void *old_data = NULL;
-
-     /* first element */
-     if (list->head && list->head->data && (cmp(list->head->data, target_data) == 0)) {
-	  old_elt = list->head;
-	  old_data = list->head->data;
-	  void_list_pop(list);
-     } else {
-	  int found = 0;
-	  for (prior = list->head; prior && prior->next; prior = prior->next) {
-	       if (prior->next->data && (cmp(prior->next->data, target_data) == 0)) {
-		    old_elt = prior->next;
-		    old_data = old_elt->data;
-		    found = 1;
-		    break;
-	       }
-	  }
-	  if (!found) {
-	       return NULL;
-	  }
-	  prior->next = old_elt->next;
-
-	  if (old_elt == list->tail) {
-	       list->tail = prior;
-	  }
-     }
-     if (old_elt)
-	  void_list_elt_deinit(old_elt);
-
-     if (old_data)
-	  return old_data;
-     else
-	  return NULL;
-}

Copied: trunk/src/target/opkg/void_list.c (from rev 3879, trunk/src/target/ipkg/void_list.c)

Deleted: trunk/src/target/opkg/xregex.c
===================================================================
--- trunk/src/target/ipkg/xregex.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/xregex.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,48 +0,0 @@
-/* xregex.c - regex functions with error messages
-
-   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.
-*/
-
-#include "ipkg.h"
-
-#include "xregex.h"
-
-static void print_regcomp_err(const regex_t *preg, int err);
-
-int xregcomp(regex_t *preg, const char *regex, int cflags)
-{
-    int err;
-    err = regcomp(preg, regex, cflags);
-    if (err) {
-	print_regcomp_err(preg, err);
-    }
-
-    return err;
-}
-
-static void print_regcomp_err(const regex_t *preg, int err)
-{
-    int size;
-    char *error;
-    
-    fprintf(stderr, "%s: Error compiling regex:", __FUNCTION__);
-    size = regerror(err, preg, 0, 0);
-    error = malloc(size);
-    if (error) {
-	regerror(err, preg, error, size);
-	fprintf(stderr, "%s\n", error);
-    }
-    free(error);
-}

Copied: trunk/src/target/opkg/xregex.c (from rev 3879, trunk/src/target/ipkg/xregex.c)

Deleted: trunk/src/target/opkg/xsystem.c
===================================================================
--- trunk/src/target/ipkg/xsystem.c	2008-01-18 10:03:14 UTC (rev 3877)
+++ trunk/src/target/opkg/xsystem.c	2008-01-18 11:30:53 UTC (rev 3880)
@@ -1,64 +0,0 @@
-/* xsystem.c - system(3) with error messages
-
-   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.
-*/
-
-#include "ipkg.h"
-#include <sys/wait.h>
-
-#include "xsystem.h"
-
-/* XXX: FEATURE: I shouldn't actually use system(3) at all. I don't
-   really need the /bin/sh invocation which takes resources and
-   introduces security problems. I should switch all of this to a sort
-   of execl() or execv() interface/implementation.
-*/
-
-/* Like system(3), but with error messages printed if the fork fails
-   or if the child process dies due to an uncaught signal. Also, the
-   return value is a bit simpler:
-
-   -1 if there was any problem
-   Otherwise, the 8-bit return value of the program ala WEXITSTATUS
-   as defined in <sys/wait.h>.
-*/
-int xsystem(const char *cmd)
-{
-    int err;
-
-    err = system(cmd);
-
-    if (err == -1) {
-	fprintf(stderr, "%s: ERROR: fork failed before execution: `%s'\n",
-		__FUNCTION__, cmd);
-	return -1;
-    }
-
-    if (WIFSIGNALED(err)) {
-	fprintf(stderr, "%s: ERROR: Child process died due to signal %d: `%s'\n",
-		__FUNCTION__, WTERMSIG(err), cmd);
-	return -1;
-    }
-
-    if (WIFEXITED(err)) {
-	/* Normal child exit */
-	return WEXITSTATUS(err);
-    }
-
-    fprintf(stderr, "%s: ERROR: Received unintelligible return value from system: %d",
-	    __FUNCTION__, err);
-    return -1;
-}
-	 

Copied: trunk/src/target/opkg/xsystem.c (from rev 3879, trunk/src/target/ipkg/xsystem.c)





More information about the commitlog mailing list