Merge commit 'meins/master'

Conflicts:

	Makefile
	adu.c

diff --cc Makefile
index 3cd9cc4a73a0a847ccb459dc699b3e007323f0c5,e039865dbac58ee57d5000b72767abf7f9cdc3d8..b590b29492766633a0150f33ee2cf6bfe529b02a
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,4 -1,4 +1,4 @@@
- objects := adu.o string.o
 -objects := osl.o fd.o rbtree.o string.o adu.o sha1.o cmdline.o
++objects := adu.o string.o cmdline.o
  all: adu
  
  DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
@@@ -19,8 -19,15 +19,15 @@@ Makefile.deps: $(wildcard *.c *.h
  -include Makefile.deps
  
  adu: $(objects)
 -      $(CC) -o $@ $(objects) -lcrypto
 +      $(CC) -o $@ $(objects) -lcrypto -losl
  
+ cmdline.o: cmdline.c cmdline.h
+       $(CC) -c $(CPPFLAGS) $<
+ 
+ cmdline.c cmdline.h: adu.ggo
+       gengetopt --conf-parser < $<
+ 
+ 
  %.o: %.c Makefile
        $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
  

diff --cc adu.c
index 598919a9a73f06b2e41015bd53d60283757c3285,8068d205f2274dded3074158a105243bb4de1b11..9edcc58cb47920d65ea78a53d9cefef618b240e3
--- 1/adu.c
--- 2/adu.c
+++ b/adu.c
@@@ -2,9 -2,12 +2,11 @@@
  #include <dirent.h> /* readdir() */
  
  #include "gcc-compat.h"
 -#include "osl.h"
+ #include "cmdline.h"
  #include "fd.h"
 -#include "hash.h"
  #include "string.h"
  #include "error.h"
++#include "portable_io.h"
  
  DEFINE_ERRLIST;