Version 0.1.6

* Use <cespedes@debian.org> as maintainer address
* Some clean-ups

9 files changed, 58 insertions, 43 deletions

diff --git a/README b/README
index 66a8a33..dea41f4 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
 
                        A Dynamic Library Tracer
 
-         Copyright 1997 Juan Cespedes <cespedes@etsit.upm.es>
+         Copyright 1997 Juan Cespedes <cespedes@debian.org>
 
 
 Contents
@@ -44,11 +44,11 @@ other i386 based POSIX system, such as Hurd or *BSD.
 -------
 Too many to list here :).  If you like to submit a bug report, or a
 feature request, either do that against the Debian `ltrace' package,
-or mail ``Juan Cespedes <cespedes@etsit.upm.es>''.
+or mail ``Juan Cespedes <cespedes@debian.org>''.
 
 6. Licence
 ----------
-    Copyright (C) 1997 Juan Cespedes <cespedes@etsit.upm.es>
+    Copyright (C) 1997 Juan Cespedes <cespedes@debian.org>
 
     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
diff --git a/TODO b/TODO
index 54019f6..29c5861 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,14 @@
 * {enable,disable}_all_breakpoints should be process-dependent
 
-* All wait4's should be moved to chld_handler():
+* All wait4's should be wait_for_child():
   + A process may stop because:
-    - It execve()'d (needs breakpoints to be added)
+    - It execve()'d (needs breakpoints to be added) (DONE)
     - It received a signal                          (DONE)
     - It breakpointed at a library call             (DONE)
     - It breakpointed at a library return
     - It breakpointed at a syscall
     - It breakpointed at a syscall return
+    - It breakpointed after a SINGLESTEP
 
 * ``struct_process'' should also have:
   + The state of the process:
@@ -17,9 +18,10 @@
     - within a given syscall      (DONE)
   + All the symbols it has breakpointed, and, for each of them:
     - its addr
-    - its return addr, if any
-    - whether the return addr is breakpointed (ie, if the symbol is ``active'')
-    - the original value in the addr, and in the return addr, if appropiate
+    - the original value in the addr, if appropiate
+  + Whether a return from a libcall is pending, and if so:
+    - its return addr
+    - the original value in the return addr
 
 * I should parse a config file (/etc/ltrace.conf & ~/.ltracerc) to
   handle different arguments to the library calls
diff --git a/debian/changelog b/debian/changelog
index 9843cdd..0c79334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ltrace (0.1.6) experimental; urgency=low
+
+  * New maintainer address
+  * New Standards-Version
+
+ -- Juan Cespedes <cespedes@debian.org>  Thu, 11 Sep 1997 23:22:32 +0200
+
 ltrace (0.1.5) experimental; urgency=low
 
   * `command' is now searched in the PATH
diff --git a/debian/control b/debian/control
index 3fd668d..396ce14 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: ltrace
 Section: utils
 Priority: optional
-Maintainer: Juan Cespedes <cespedes@etsit.upm.es>
-Standards-Version: 2.2.0.0
+Maintainer: Juan Cespedes <cespedes@debian.org>
+Standards-Version: 2.3.0.0
 
 Package: ltrace
 Architecture: i386
diff --git a/debian/copyright b/debian/copyright
index f4c4cfa..106ee71 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,13 @@ This is the Debian GNU/Linux's prepackaged version of the
 Dynamic Library Tracer ``ltrace''.
 
 
-Copyright (C) 1997 Juan Cespedes <cespedes@etsit.upm.es>
+Copyrights
+----------
+Copyright (C) 1997 Juan Cespedes <cespedes@debian.org>
 
 
+License
+-------
 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)
@@ -16,8 +20,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
 
 A copy of the GNU General Public License is available as
-`/usr/doc/copyright/GPL.gz' in the Debian GNU/Linux distribution or on
+`/usr/doc/copyright/GPL' in the Debian GNU/Linux distribution or on
 the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'. You can
-also obtain it by writing to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+also obtain it by writing to the Free Software Foundation, Inc., 59
+Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
diff --git a/debian/rules b/debian/rules
index 7da5dbc..35be3a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,35 +1,34 @@
 #! /usr/bin/make -f 
+#
+# Copyright (C) 1997 Juan Cespedes <cespedes@debian.org>
 
 build:
-	$(MAKE)
-	touch build
+		$(MAKE)
+		touch build
 
 binary:		binary-arch binary-indep
 
 binary-indep:
 
 binary-arch:	build
-	test root = "`whoami`" || exit 1
-	$(RM) -rf debian/tmp
+		test root = "`whoami`" || exit 1
+		$(RM) -rf debian/tmp
 
-	install -d debian/tmp/DEBIAN
-#	install -m 644 debian/conffiles debian/tmp/DEBIAN
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp
-	install -m 644 README debian/tmp/usr/doc/ltrace
-	install -m 644 BUGS debian/tmp/usr/doc/ltrace
-	install -m 644 TODO debian/tmp/usr/doc/ltrace
-	install -m 644 debian/changelog debian/tmp/usr/doc/ltrace
-	gzip -9fv debian/tmp/usr/doc/ltrace/*
-	install -m 644 debian/copyright debian/tmp/usr/doc/ltrace
-	gzip -9f debian/tmp/usr/man/man1/*
-	dpkg-shlibdeps debian/tmp/usr/bin/ltrace
-	dpkg-gencontrol
-	chown -R root.root debian/tmp
-	chmod -R g-ws debian/tmp
-	dpkg --build debian/tmp ..
+		install -d debian/tmp/DEBIAN
+		$(MAKE) install DESTDIR=`pwd`/debian/tmp
+		cp -p README debian/tmp/usr/doc/ltrace
+		cp -p BUGS debian/tmp/usr/doc/ltrace
+		cp -p TODO debian/tmp/usr/doc/ltrace
+		cp -p debian/changelog debian/tmp/usr/doc/ltrace
+		gzip -9fv debian/tmp/usr/doc/ltrace/*
+		cp -p debian/copyright debian/tmp/usr/doc/ltrace
+		gzip -9f debian/tmp/usr/man/man1/*
+		dpkg-shlibdeps debian/tmp/usr/bin/ltrace
+		dpkg-gencontrol
+		dpkg --build debian/tmp ..
 
 clean:
-	$(RM) -f build debian/files debian/substvars
-	$(MAKE) clean
-	$(RM) -rf debian/tmp
+		$(RM) -f build debian/files debian/substvars
+		$(MAKE) clean
+		$(RM) -rf debian/tmp
 
diff --git a/etc/ltrace.rc b/etc/ltrace.rc
index f49dd77..548c39d 100644
--- a/etc/ltrace.rc
+++ b/etc/ltrace.rc
@@ -1,9 +1,10 @@
-; +	== May vary (ie, is a returned value)
+; +		== May vary (ie, is a returned value)
 ; int
-; addr	== (void *)		[int, expresado en hexa]
-; file	== (FILE *)
+; addr		== (void *)		[int, written in hexa]
+; file		== (FILE *)
 ; format	== ((char *), ...)	[printf() like]
-; octal	== int			[expresado en octal]
+; octal		== int			[written in octal]
+; string	== (char *)
 
 int atexit(addr);
 int close(int);
diff --git a/ltrace.1 b/ltrace.1
index 6b37fe7..1d5ef9b 100644
--- a/ltrace.1
+++ b/ltrace.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1997 Juan Cespedes <cespedes@etsit.upm.es>
+.\" Copyright (c) 1997 Juan Cespedes <cespedes@debian.org>
 .\" This file is covered by the GNU GPL
 .TH ltrace 1 
 .SH NAME
@@ -43,7 +43,7 @@ If you like to report a bug, send a notice to the author, or use the
 program if you are under Debian GNU/Linux.
 
 .SH AUTHOR
-Juan Cespedes <cespedes@etsit.upm.es>
+Juan Cespedes <cespedes@debian.org>
 
 .SH "SEE ALSO"
 .BR strace(1) ,
diff --git a/process.c b/process.c
index c78390b..71f9791 100644
--- a/process.c
+++ b/process.c
@@ -99,7 +99,9 @@ void wait_for_child(void)
 	pid = wait4(-1, &status, 0, NULL);
 	if (pid==-1) {
 		if (errno == ECHILD) {
-			send_line("No more children");
+			if (opt_d>0) {
+				send_line("No more children");
+			}
 			exit(0);
 		}
 		perror("wait4");