oweals/busybox.git
17 years ago- remove warning about unused depth parameter in add_to_dirlist()
Bernhard Reutner-Fischer [Wed, 13 Dec 2006 16:50:15 +0000 (16:50 -0000)]
- remove warning about unused depth parameter in add_to_dirlist()
- make one variable static and add comment about why the other variables there are not static.

17 years agodate: -R shouldn't use locale
Denis Vlasenko [Wed, 13 Dec 2006 00:35:21 +0000 (00:35 -0000)]
date: -R shouldn't use locale

17 years agobuild system: small fix for "release" target to work
Denis Vlasenko [Tue, 12 Dec 2006 23:46:31 +0000 (23:46 -0000)]
build system: small fix for "release" target to work

17 years agobuild system: add "release" target
Denis Vlasenko [Tue, 12 Dec 2006 22:31:15 +0000 (22:31 -0000)]
build system: add "release" target
find: support -size N (needed for above)

17 years agopasswd: fix indentation
Denis Vlasenko [Tue, 12 Dec 2006 18:11:58 +0000 (18:11 -0000)]
passwd: fix indentation

17 years agopasswd: added comment
Denis Vlasenko [Tue, 12 Dec 2006 17:14:56 +0000 (17:14 -0000)]
passwd: added comment

17 years agopasswd: shrink by ~10 bytes, use PRNG instead of usleep.
Denis Vlasenko [Tue, 12 Dec 2006 14:38:03 +0000 (14:38 -0000)]
passwd: shrink by ~10 bytes, use PRNG instead of usleep.

17 years ago- remove functions marked as LEGACY in SUSv3 and use their modern counterparts.
Bernhard Reutner-Fischer [Tue, 12 Dec 2006 11:50:44 +0000 (11:50 -0000)]
- remove functions marked as LEGACY in SUSv3 and use their modern counterparts.

17 years ago- add an anchor to let me point people to FAQ.html#standalone_shell
Bernhard Reutner-Fischer [Sun, 10 Dec 2006 13:40:16 +0000 (13:40 -0000)]
- add an anchor to let me point people to FAQ.html#standalone_shell
  easily.

17 years agobb_makedev: fix for glibc 2.3.2
Denis Vlasenko [Sun, 10 Dec 2006 02:52:19 +0000 (02:52 -0000)]
bb_makedev: fix for glibc 2.3.2
sed: fix C++ style declaration

17 years agosed: style fixes
Denis Vlasenko [Sun, 10 Dec 2006 02:09:12 +0000 (02:09 -0000)]
sed: style fixes

17 years agomore: fix for case when _FILE_OFFSET_BITS is not #defined.
Denis Vlasenko [Sun, 10 Dec 2006 01:57:29 +0000 (01:57 -0000)]
more: fix for case when _FILE_OFFSET_BITS is not #defined.
samll size improvement.

17 years ago- Proposed fix to make aliases work (with uClibc-current).
Bernhard Reutner-Fischer [Thu, 7 Dec 2006 12:25:17 +0000 (12:25 -0000)]
- Proposed fix to make aliases work (with uClibc-current).
  See comment in the patch about the change introduced in r16342.

17 years ago- Improve wording in error message.
Bernhard Reutner-Fischer [Thu, 7 Dec 2006 12:18:36 +0000 (12:18 -0000)]
- Improve wording in error message.

17 years ago- s/:\t\t/\t/ for two helptexts.
Bernhard Reutner-Fischer [Thu, 7 Dec 2006 12:16:17 +0000 (12:16 -0000)]
- s/:\t\t/\t/ for two helptexts.

17 years ago- remove a warning that was not ment to be checked in.
Bernhard Reutner-Fischer [Wed, 6 Dec 2006 23:14:31 +0000 (23:14 -0000)]
- remove a warning that was not ment to be checked in.

17 years ago- better distinction between CFLAGS and CPPFLAGS.
Bernhard Reutner-Fischer [Wed, 6 Dec 2006 21:51:59 +0000 (21:51 -0000)]
- better distinction between CFLAGS and CPPFLAGS.

17 years ago- adjust to kernel's build infrastructure.
Bernhard Reutner-Fischer [Wed, 6 Dec 2006 15:29:00 +0000 (15:29 -0000)]
- adjust to kernel's build infrastructure.

17 years ago- shrink less.
Bernhard Reutner-Fischer [Mon, 4 Dec 2006 16:04:50 +0000 (16:04 -0000)]
- shrink less.
01a: svn version
01b: merge past_eof and inp_stdin into flags.
01c: merge match_backwards into flags.
01d: add handling of <HOME> and <END> keys, remove set_tty_raw, use fflush_stdout_and_exit
01e: rewrite special-key handling to be smaller.
01f: changing the format saves 4 bytes (alot of places would benefit from this)
   text    data     bss     dec     hex filename
   9034       8     648    9690    25da less.o.01a
   9023       8     640    9671    25c7 less.o.01b
   9027       8     636    9671    25c7 less.o.01c
   9068       8     636    9712    25f0 less.o.01d
   8990       8     636    9634    25a2 less.o.01e
   8986       8     636    9630    259e less.o.01f

17 years ago- cosmetic change to avoid warnings about eventual padding/packing.
Bernhard Reutner-Fischer [Mon, 4 Dec 2006 15:58:27 +0000 (15:58 -0000)]
- cosmetic change to avoid warnings about eventual padding/packing.

17 years ago- make sure we pickup the correct defines. Guards against 2.6.19 kernel-headers.
Bernhard Reutner-Fischer [Mon, 4 Dec 2006 15:57:17 +0000 (15:57 -0000)]
- make sure we pickup the correct defines. Guards against 2.6.19 kernel-headers.

17 years ago- commentary typo
Bernhard Reutner-Fischer [Sat, 2 Dec 2006 20:47:36 +0000 (20:47 -0000)]
- commentary typo

17 years agosed: fix handling of files not ending in '\n'
Denis Vlasenko [Sat, 2 Dec 2006 20:12:12 +0000 (20:12 -0000)]
sed: fix handling of files not ending in '\n'

17 years agosed: improve handling of NULs
Denis Vlasenko [Sat, 2 Dec 2006 17:58:10 +0000 (17:58 -0000)]
sed: improve handling of NULs

17 years agopasswd: made smaller by ~130 bytes. size can go negative
Denis Vlasenko [Fri, 1 Dec 2006 21:34:20 +0000 (21:34 -0000)]
passwd: made smaller by ~130 bytes. size can go negative
if current trend will continue ;)

17 years ago- provide central knob to turn off RPC related options.
Bernhard Reutner-Fischer [Fri, 1 Dec 2006 16:56:12 +0000 (16:56 -0000)]
- provide central knob to turn off RPC related options.

17 years agopasswd: micro-optimization
Denis Vlasenko [Thu, 30 Nov 2006 23:13:59 +0000 (23:13 -0000)]
passwd: micro-optimization

17 years ago"kernel config" -> "busybox config"
Denis Vlasenko [Thu, 30 Nov 2006 22:40:32 +0000 (22:40 -0000)]
"kernel config" -> "busybox config"
suggested by Roberto A. Foglietta <roberto.foglietta@gmail.com>

17 years ago"make bigdata" biggest offender dealt with:
Denis Vlasenko [Thu, 30 Nov 2006 21:11:01 +0000 (21:11 -0000)]
"make bigdata" biggest offender dealt with:
xmalloc 16Kb buffer instead of keeping it in bss

17 years agoed: convert style to bbox's. No code changes.
Denis Vlasenko [Thu, 30 Nov 2006 20:57:50 +0000 (20:57 -0000)]
ed: convert style to bbox's. No code changes.

17 years agopasswd: small size optimization. salt generation improved
Denis Vlasenko [Thu, 30 Nov 2006 20:41:28 +0000 (20:41 -0000)]
passwd: small size optimization. salt generation improved
(really generated different salts even if called back-to-back).

17 years agopasswd: rework:
Denis Vlasenko [Thu, 30 Nov 2006 16:41:15 +0000 (16:41 -0000)]
passwd: rework:
* do not make backup copy by copying (just retain old file)
* correctly fall back to /etc/passwd if user is not in shadow
* fix bug with overlong passwd entries
* be permissive on some kinds of failures
* reduce stack usage
* code size: -500 bytes

17 years ago- save 4 bytes
Bernhard Reutner-Fischer [Thu, 30 Nov 2006 14:53:51 +0000 (14:53 -0000)]
- save 4 bytes
   text    data     bss     dec     hex filename
    764       0      80     844     34c vlock.o.oorig
    760       0      80     840     348 vlock.o

17 years agoWell, I am not 100.00% usre that uint16 will suffice there.
Denis Vlasenko [Wed, 29 Nov 2006 23:15:04 +0000 (23:15 -0000)]
Well, I am not 100.00% usre that uint16 will suffice there.
We don't lose anything by using 'unsigned' instead.

17 years agoanother -90 bytes. That #define is **evil**
Denis Vlasenko [Wed, 29 Nov 2006 22:47:42 +0000 (22:47 -0000)]
another -90 bytes. That #define is **evil**

17 years agomkfs.minix: more cleanups, -~300 bytes of code.
Denis Vlasenko [Wed, 29 Nov 2006 22:33:47 +0000 (22:33 -0000)]
mkfs.minix: more cleanups, -~300 bytes of code.
Added debugging support.

17 years agocut 0.5k off mkfs.minix
Denis Vlasenko [Wed, 29 Nov 2006 18:15:52 +0000 (18:15 -0000)]
cut 0.5k off mkfs.minix
assorted strtoul fixes (that's what brought me into minix)...

17 years agohttpd: fix decode of '/' when called via -d
Denis Vlasenko [Wed, 29 Nov 2006 15:58:50 +0000 (15:58 -0000)]
httpd: fix decode of '/' when called via -d

17 years agood: fix buglet in --traditional, microoptimization,
Denis Vlasenko [Wed, 29 Nov 2006 14:32:01 +0000 (14:32 -0000)]
od: fix buglet in --traditional, microoptimization,
    document coreutils bug
bloat-o-meter: account for objects in rodata too

17 years agogetopt32-ification of fdisk
Denis Vlasenko [Wed, 29 Nov 2006 12:00:28 +0000 (12:00 -0000)]
getopt32-ification of fdisk

17 years agofix support for globally disabling --long-options.
Denis Vlasenko [Wed, 29 Nov 2006 11:09:43 +0000 (11:09 -0000)]
fix support for globally disabling --long-options.
(disabling them saves ~4K on fully configured bbox)

17 years agood: sometime ago I landed BIG od implementation
Denis Vlasenko [Tue, 28 Nov 2006 23:37:46 +0000 (23:37 -0000)]
od: sometime ago I landed BIG od implementation
from coreutils. My fault. This commit contains
cleanups and size reductions.

17 years agofix bug in new str -> num convertors
Denis Vlasenko [Tue, 28 Nov 2006 10:54:16 +0000 (10:54 -0000)]
fix bug in new str -> num convertors

18 years agousage: fix few help texts, fix breakage: '\<tab>'
Denis Vlasenko [Tue, 28 Nov 2006 00:46:49 +0000 (00:46 -0000)]
usage: fix few help texts, fix breakage: '\<tab>'
sequence utterly confused cpp :)

18 years agoudhcpc: fix my breakage
Denis Vlasenko [Tue, 28 Nov 2006 00:21:46 +0000 (00:21 -0000)]
udhcpc: fix my breakage

18 years agofix udhcpc help message, take steps to make usage.h less messy
Denis Vlasenko [Tue, 28 Nov 2006 00:06:39 +0000 (00:06 -0000)]
fix udhcpc help message, take steps to make usage.h less messy

18 years agodo not overflow ifr_name. maybe it was safe in some places,
Denis Vlasenko [Mon, 27 Nov 2006 23:44:57 +0000 (23:44 -0000)]
do not overflow ifr_name. maybe it was safe in some places,
but not everywhere. err to the safe side.

18 years agoudhcpc: convert to getopt32
Denis Vlasenko [Mon, 27 Nov 2006 23:43:28 +0000 (23:43 -0000)]
udhcpc: convert to getopt32

18 years agotar: fix misplaced --exclude long option definition
Denis Vlasenko [Mon, 27 Nov 2006 20:24:40 +0000 (20:24 -0000)]
tar: fix misplaced --exclude long option definition

18 years agoClosing bug 1040:
Denis Vlasenko [Mon, 27 Nov 2006 19:50:16 +0000 (19:50 -0000)]
Closing bug 1040:
The "quiet" option is quietly (hah) ignored. It should be passed through
to the mount() syscall in the comma separated list of options.
I found the problem with the vfat/msdos filesystems, which uses
a quiet option to override some complaints and errors.

18 years agoerase_mtab: do not limit ourself to 40 mtab entries
Denis Vlasenko [Mon, 27 Nov 2006 17:29:09 +0000 (17:29 -0000)]
erase_mtab: do not limit ourself to 40 mtab entries

18 years agofix remaining survivors of the return(a) cleanup
Denis Vlasenko [Mon, 27 Nov 2006 16:59:15 +0000 (16:59 -0000)]
fix remaining survivors of the return(a) cleanup

18 years agostyle cleanup: return(a) -> return a, part 2
Denis Vlasenko [Mon, 27 Nov 2006 16:49:55 +0000 (16:49 -0000)]
style cleanup: return(a) -> return a, part 2

18 years agostyle cleanup: return(a) -> return a, part 1
Denis Vlasenko [Mon, 27 Nov 2006 16:49:31 +0000 (16:49 -0000)]
style cleanup: return(a) -> return a, part 1

18 years agobyteswap ops had extra mask ops - removed
Denis Vlasenko [Mon, 27 Nov 2006 16:48:17 +0000 (16:48 -0000)]
byteswap ops had extra mask ops - removed

18 years agosvn add bb_strtonum.c :(
Denis Vlasenko [Mon, 27 Nov 2006 15:12:16 +0000 (15:12 -0000)]
svn add bb_strtonum.c :(

18 years agoProvide our own isdigit macro. saves more than 400 bytes.
Denis Vlasenko [Mon, 27 Nov 2006 14:44:18 +0000 (14:44 -0000)]
Provide our own isdigit macro. saves more than 400 bytes.

18 years agosafe_strtoXX interface proved to be a bit unconvenient.
Denis Vlasenko [Mon, 27 Nov 2006 14:43:21 +0000 (14:43 -0000)]
safe_strtoXX interface proved to be a bit unconvenient.
Remove it, introduce saner bb_strtoXX.
Saved ~350 bytes.

18 years ago- minor shrinkage
Bernhard Reutner-Fischer [Mon, 27 Nov 2006 13:58:18 +0000 (13:58 -0000)]
- minor shrinkage
   text    data     bss     dec     hex filename
    773       0      80     853     355 vlock.o.orig
    766       0      80     846     34e vlock.o

18 years agoifconfig: do not try to continue on errors. not much sence in doing that
Denis Vlasenko [Mon, 27 Nov 2006 10:03:21 +0000 (10:03 -0000)]
ifconfig: do not try to continue on errors. not much sence in doing that
IMHO, but requires extra code.

18 years agodeluser: the same code, but a bit less obfuscated.
Denis Vlasenko [Mon, 27 Nov 2006 01:04:23 +0000 (01:04 -0000)]
deluser: the same code, but a bit less obfuscated.

18 years agodeluser: size reduction by 60 bytes.
Denis Vlasenko [Mon, 27 Nov 2006 00:54:59 +0000 (00:54 -0000)]
deluser: size reduction by 60 bytes.
patch from Tito <farmatito@tiscali.it>

18 years agoadded gcc flag which is needed for ULLONG_MAX to appear
Denis Vlasenko [Sun, 26 Nov 2006 22:17:46 +0000 (22:17 -0000)]
added gcc flag which is needed for ULLONG_MAX to appear
on Tito's box

18 years agoClosing bug 730. libbb run_parts is using scandir (a GNUism),
Denis Vlasenko [Sun, 26 Nov 2006 20:13:39 +0000 (20:13 -0000)]
Closing bug 730. libbb run_parts is using scandir (a GNUism),
and it is used only by run_parts applet, so move it there.
Also saved ~30 bytes (prolly gcc autoinlining...).

18 years agoadded small doc about tar 'pax header' format
Denis Vlasenko [Sun, 26 Nov 2006 17:07:38 +0000 (17:07 -0000)]
added small doc about tar 'pax header' format

18 years agosort: two small optimizations
Denis Vlasenko [Sun, 26 Nov 2006 15:48:54 +0000 (15:48 -0000)]
sort: two small optimizations

18 years agosort: reformat entire file wrt style.
Denis Vlasenko [Sun, 26 Nov 2006 15:48:03 +0000 (15:48 -0000)]
sort: reformat entire file wrt style.
fix single obvious bug: right hand was 0 here:
 flags & (FLAG_b&FLAG_d&FLAG_f&FLAG_i&FLAG_bb)
fixed to use |

18 years agosmall fixes:
Denis Vlasenko [Sun, 26 Nov 2006 15:45:17 +0000 (15:45 -0000)]
small fixes:
fix xstrdup to not grossly overallocate memory
use xopen instean of xopen3 in several places
etc.

18 years agotar: refuse to untar files with "/../" components
Denis Vlasenko [Sun, 26 Nov 2006 15:42:03 +0000 (15:42 -0000)]
tar: refuse to untar files with "/../" components

18 years agotar: correctly skip (and warn about) pax headers.
Denis Vlasenko [Sun, 26 Nov 2006 01:46:59 +0000 (01:46 -0000)]
tar: correctly skip (and warn about) pax headers.
plug memory leak. save 50 bytes.
Wooohooo! we finally can unpack kernel tarballs!

18 years agotar: add support for FEATURE_TAR_GNU_EXTENSIONS so than we can save
Denis Vlasenko [Sat, 25 Nov 2006 23:56:50 +0000 (23:56 -0000)]
tar: add support for FEATURE_TAR_GNU_EXTENSIONS so than we can save
long names now. We were able to read such tars, but not create.
+275 bytes. Without FEATURE_TAR_GNU_EXTENSIONS: -25 bytes.

We still cannot unpack Linux kernels, but not for long ;)

18 years agotee: fix bug: argv[-1] is a no-no!
Denis Vlasenko [Sat, 25 Nov 2006 23:50:28 +0000 (23:50 -0000)]
tee: fix bug: argv[-1] is a no-no!
bb_full_fd_action: optimize
die_if_ferror: "<applet>: filename" isn't a good err msg, add "..I/O error"

18 years agotar: small fix and small optimization
Denis Vlasenko [Sat, 25 Nov 2006 23:47:32 +0000 (23:47 -0000)]
tar: small fix and small optimization

18 years agosmall improvements in str -> num convertors
Denis Vlasenko [Sat, 25 Nov 2006 14:49:04 +0000 (14:49 -0000)]
small improvements in str -> num convertors

18 years agotar: abort if tarring up file larger that 64Gb
Denis Vlasenko [Sat, 25 Nov 2006 14:48:09 +0000 (14:48 -0000)]
tar: abort if tarring up file larger that 64Gb
(otherwise we will produce garbled tarfile)

18 years agodd: support >2gb values for seek, skip, count
Denis Vlasenko [Sat, 25 Nov 2006 14:46:21 +0000 (14:46 -0000)]
dd: support >2gb values for seek, skip, count

18 years agoregularize str -> num convertors
Denis Vlasenko [Sat, 25 Nov 2006 14:44:13 +0000 (14:44 -0000)]
regularize str -> num convertors

18 years agosmall optimization
Denis Vlasenko [Fri, 24 Nov 2006 22:42:44 +0000 (22:42 -0000)]
small optimization

18 years agotar: fix multiple -t and/or -v options handling.
Denis Vlasenko [Fri, 24 Nov 2006 21:55:55 +0000 (21:55 -0000)]
tar: fix multiple -t and/or -v options handling.
do not process list of files to tar up in reverse order.

18 years agotar: sanitize option handling
Denis Vlasenko [Fri, 24 Nov 2006 21:54:44 +0000 (21:54 -0000)]
tar: sanitize option handling

18 years agotar: buglet fix
Denis Vlasenko [Fri, 24 Nov 2006 18:53:13 +0000 (18:53 -0000)]
tar: buglet fix

18 years agotar: fix and sanitize handling of long filenames/linknames
Denis Vlasenko [Fri, 24 Nov 2006 17:21:44 +0000 (17:21 -0000)]
tar: fix and sanitize handling of long filenames/linknames
(GNU extensions 'K' and 'L').
We correctly handle them when untarring now, but unfortunately
we still don't use them when tarring! That stupid 100 char limit
is still there!
The biggest problem is that we don't support 'pax' tar format.
Linux kernel tarballs are in this format... shame

18 years agohunt down improper include <>, make mkswap output 4Gb+ friendly
Denis Vlasenko [Fri, 24 Nov 2006 15:38:03 +0000 (15:38 -0000)]
hunt down improper include <>, make mkswap output 4Gb+ friendly

18 years agosvn add makedev.c. Forgot as usual... :(
Denis Vlasenko [Fri, 24 Nov 2006 15:06:28 +0000 (15:06 -0000)]
svn add makedev.c. Forgot as usual... :(

18 years agotar: small fixes:
Denis Vlasenko [Fri, 24 Nov 2006 14:59:45 +0000 (14:59 -0000)]
tar: small fixes:
* size-optimize mapping code
* kill double close

18 years agotar: cache [ug]id->username/groupname mappings. Cuts down amount
Denis Vlasenko [Fri, 24 Nov 2006 14:57:31 +0000 (14:57 -0000)]
tar: cache [ug]id->username/groupname mappings. Cuts down amount
of open/read/close of /etc/passwd and /etc/group
dramatically (we were rereading those for each untarred file!!!)

18 years agotar: cry murder and bail out if file shrinks under us while we tar it up
Denis Vlasenko [Fri, 24 Nov 2006 14:55:23 +0000 (14:55 -0000)]
tar: cry murder and bail out if file shrinks under us while we tar it up

18 years agoglibc makedev() is a large inline. Save 700+ bytes by wrapping it
Denis Vlasenko [Fri, 24 Nov 2006 14:54:27 +0000 (14:54 -0000)]
glibc makedev() is a large inline. Save 700+ bytes by wrapping it
into a function.

18 years agoheader_verbose_list: stop truncating file size in listing
Denis Vlasenko [Fri, 24 Nov 2006 14:53:18 +0000 (14:53 -0000)]
header_verbose_list: stop truncating file size in listing

18 years agotar:
Denis Vlasenko [Fri, 24 Nov 2006 14:51:01 +0000 (14:51 -0000)]
tar:
* unpack: handle tar header fields which are not NUL terminated
* pack: handle 4+GB files correctly
* pack: refuse to store 101+ softlinks (was truncating link
  target name)
* pack: mask mode with 07777

18 years agomd5sum: make -c grok formats like "68b329da9893e34099c7d8ad5cb9c940 *foo".
Denis Vlasenko [Thu, 23 Nov 2006 15:59:12 +0000 (15:59 -0000)]
md5sum: make -c grok formats like "68b329da9893e34099c7d8ad5cb9c940 *foo".
Also eradicate 95 bytes of bloat.

18 years agoifupdown:
Denis Vlasenko [Thu, 23 Nov 2006 15:08:37 +0000 (15:08 -0000)]
ifupdown:
ifconfig said to set iface up before it processes hw %hwaddress%,
which then of course fails. Thus we run two separate ifconfig

18 years agoifupdown: save some 100+ bytes of code in addstr()
Denis Vlasenko [Thu, 23 Nov 2006 15:07:38 +0000 (15:07 -0000)]
ifupdown: save some 100+ bytes of code in addstr()

18 years agowget: -O - still outputs progressbar (to stderr)
Denis Vlasenko [Thu, 23 Nov 2006 13:10:23 +0000 (13:10 -0000)]
wget: -O - still outputs progressbar (to stderr)
Noticed dead code. -100 bytes.

18 years agoadd "wpad" DHCP option. Spotted some optimization opportunities: -80 bytes
Denis Vlasenko [Thu, 23 Nov 2006 12:57:49 +0000 (12:57 -0000)]
add "wpad" DHCP option. Spotted some optimization opportunities: -80 bytes

18 years agointroduce setsockopt_reuseaddr(int fd), setsockopt_broadcast(int fd),
Denis Vlasenko [Wed, 22 Nov 2006 23:22:06 +0000 (23:22 -0000)]
introduce setsockopt_reuseaddr(int fd), setsockopt_broadcast(int fd),
use them where appropriate. 200 bytes saved

18 years ago- add FIXME to brokenness in the installer..
Bernhard Reutner-Fischer [Wed, 22 Nov 2006 18:40:06 +0000 (18:40 -0000)]
- add FIXME to brokenness in the installer..

18 years ago- fix typo
Bernhard Reutner-Fischer [Wed, 22 Nov 2006 18:21:08 +0000 (18:21 -0000)]
- fix typo

18 years agofix double merge
Denis Vlasenko [Wed, 22 Nov 2006 17:42:06 +0000 (17:42 -0000)]
fix double merge

18 years ago- update TODOs
Bernhard Reutner-Fischer [Wed, 22 Nov 2006 16:48:29 +0000 (16:48 -0000)]
- update TODOs