Use our own variant of 'assert' and 'assert_perror'.

Our variants print stack traces on failures.  This will make locating
errors much easier.

7 files changed, 31 insertions, 31 deletions

diff --git a/trans/crash.c b/trans/crash.c
index f8e1658d..3fad4992 100644
--- a/trans/crash.c
+++ b/trans/crash.c
@@ -29,7 +29,7 @@
 #include <argp.h>
 #include <argz.h>
 #include <sys/mman.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <pthread.h>
 
 #include <version.h>
@@ -152,7 +152,7 @@ template_make_file_name (const char *template,
 	      break;
 
 	    default:
-	      assert (!"reached!");
+	      assert_backtrace (!"reached!");
 	    }
 	  specifier = 0;
 	}
@@ -162,7 +162,7 @@ template_make_file_name (const char *template,
 	fprintf (stream, "%c", *t);
     }
 
-  assert (! specifier);
+  assert_backtrace (! specifier);
 
   fprintf (stream, "%c", 0);
   fclose (stream);
diff --git a/trans/fakeroot.c b/trans/fakeroot.c
index 0571c3e5..df47b00f 100644
--- a/trans/fakeroot.c
+++ b/trans/fakeroot.c
@@ -76,7 +76,7 @@ new_node (file_t file, mach_port_t idport, int locked, int openmodes,
   error_t err;
   struct netnode *nn;
 
-  assert ((openmodes & ~(O_RDWR|O_EXEC)) == 0);
+  assert_backtrace ((openmodes & ~(O_RDWR|O_EXEC)) == 0);
 
   *np = netfs_make_node_alloc (sizeof *nn);
   if (*np == 0)
@@ -97,7 +97,7 @@ new_node (file_t file, mach_port_t idport, int locked, int openmodes,
     {
       ino_t fileno;
       mach_port_t fsidport;
-      assert (!locked);
+      assert_backtrace (!locked);
       err = io_identity (file, &nn->idport, &fsidport, &fileno);
       if (err)
 	{
@@ -218,7 +218,7 @@ check_openmodes (struct netnode *nn, int newmodes, file_t file)
 {
   error_t err = 0;
 
-  assert ((newmodes & ~(O_RDWR|O_EXEC)) == 0);
+  assert_backtrace ((newmodes & ~(O_RDWR|O_EXEC)) == 0);
 
   if (newmodes &~ nn->openmodes)
     {
@@ -484,7 +484,7 @@ netfs_S_dir_lookup (struct protid *diruser,
   if (err)
     goto lose;
 
-  assert (retry_name[0] == '\0' && *do_retry == FS_RETRY_NORMAL);
+  assert_backtrace (retry_name[0] == '\0' && *do_retry == FS_RETRY_NORMAL);
   flags &= ~(O_CREAT|O_EXCL|O_NOLINK|O_NOTRANS|O_NONBLOCK);
 
   err = iohelp_dup_iouser (&user, diruser->user);
@@ -531,7 +531,7 @@ error_t
 netfs_attempt_lookup (struct iouser *user, struct node *dir,
 		      char *name, struct node **np)
 {
-  assert (! "should not be here");
+  assert_backtrace (! "should not be here");
   return EIEIO;
 }
 
@@ -539,7 +539,7 @@ error_t
 netfs_attempt_create_file (struct iouser *user, struct node *dir,
 			   char *name, mode_t mode, struct node **np)
 {
-  assert (! "should not be here");
+  assert_backtrace (! "should not be here");
   return EIEIO;
 }
 
@@ -812,7 +812,7 @@ netfs_attempt_readlink (struct iouser *user, struct node *np, char *buf)
 	err = EINVAL;
       else
 	{
-	  assert (translen <= sizeof _HURD_SYMLINK + np->nn_stat.st_size + 1);
+	  assert_backtrace (translen <= sizeof _HURD_SYMLINK + np->nn_stat.st_size + 1);
 	  memcpy (buf, &trans[sizeof _HURD_SYMLINK],
 		  translen - sizeof _HURD_SYMLINK);
 	}
@@ -1087,7 +1087,7 @@ netfs_demuxer (mach_msg_header_t *inp,
       else
 	{
 	  error_t err;
-	  assert (MACH_MSGH_BITS_LOCAL (inp->msgh_bits)
+	  assert_backtrace (MACH_MSGH_BITS_LOCAL (inp->msgh_bits)
 		  == MACH_MSG_TYPE_MOVE_SEND
 		  || MACH_MSGH_BITS_LOCAL (inp->msgh_bits)
 		  == MACH_MSG_TYPE_PROTECTED_PAYLOAD);
diff --git a/trans/magic.c b/trans/magic.c
index a033db9a..e38efcae 100644
--- a/trans/magic.c
+++ b/trans/magic.c
@@ -34,7 +34,7 @@
 #include <limits.h>
 #include <argp.h>
 #include <argz.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 
 #include "fsys_S.h"
 
@@ -167,7 +167,7 @@ magic_getroot (struct trivfs_control *cntl,
   *node_type = MACH_MSG_TYPE_COPY_SEND;
 
   err = mach_port_deallocate (mach_task_self (), dotdot);
-  assert_perror (err);
+  assert_perror_backtrace (err);
 
   return 0;
 }
@@ -313,10 +313,10 @@ trivfs_S_dir_lookup (struct trivfs_protid *cred,
     }
   err = mach_port_mod_refs (mach_task_self (), dotdot,
 			    MACH_PORT_RIGHT_SEND, +1);
-  assert_perror (err);
+  assert_perror_backtrace (err);
   err = mach_port_mod_refs (mach_task_self (), cred->realnode,
 			    MACH_PORT_RIGHT_SEND, +1);
-  assert_perror (err);
+  assert_perror_backtrace (err);
 
   *retry_type = FS_RETRY_NORMAL;
   *retry_name = '\0';
diff --git a/trans/new-fifo.c b/trans/new-fifo.c
index c293b764..efa36c24 100644
--- a/trans/new-fifo.c
+++ b/trans/new-fifo.c
@@ -24,7 +24,7 @@
 #include <error.h>
 #include <string.h>
 #include <fcntl.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 
 #include <pthread.h>
 #include <hurd.h>
@@ -536,7 +536,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
   else
     {
       struct pipe *pipe = cred->po->hook;
-      assert (pipe);
+      assert_backtrace (pipe);
       pthread_mutex_lock (&pipe->lock);
       err = pipe_read (pipe, cred->po->openmodes & O_NONBLOCK, NULL,
 		       data, data_len, amount);
@@ -565,7 +565,7 @@ trivfs_S_io_readable (struct trivfs_protid *cred,
   else
     {
       struct pipe *pipe = cred->po->hook;
-      assert (pipe);
+      assert_backtrace (pipe);
       pthread_mutex_lock (&pipe->lock);
       *amount = pipe_readable (pipe, 1);
       pthread_mutex_unlock (&pipe->lock);
@@ -835,7 +835,7 @@ trivfs_S_fsys_forward (mach_port_t server,
     return EOPNOTSUPP;
 
   server_trans = cred->po->cntl->hook;
-  assert (server_trans->server);
+  assert_backtrace (server_trans->server);
 
   argz_extract (argz, argz_len, argv);
 
diff --git a/trans/password.c b/trans/password.c
index 9ffcaa0a..b9f9c5bd 100644
--- a/trans/password.c
+++ b/trans/password.c
@@ -17,7 +17,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
 #include <argp.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <errno.h>
 #include <error.h>
 #include <stdlib.h>
@@ -151,7 +151,7 @@ S_password_check_user (struct trivfs_protid *cred, uid_t user, char *pw,
   char *getpass (const char *prompt, uid_t id, int is_group,
 		 void *pwd_or_group, void *hook)
     {
-      assert (! is_group && id == user);
+      assert_backtrace (! is_group && id == user);
       return strdup (pw);
     }
 
@@ -199,7 +199,7 @@ S_password_check_group (struct trivfs_protid *cred, uid_t group, char *pw,
   char *getpass (const char *prompt, uid_t id, int is_group,
 		 void *pwd_or_group, void *hook)
     {
-      assert (is_group && id == group);
+      assert_backtrace (is_group && id == group);
       return strdup (pw);
     }
 
diff --git a/trans/random.c b/trans/random.c
index dae2ff4b..f48cea53 100644
--- a/trans/random.c
+++ b/trans/random.c
@@ -17,7 +17,7 @@
 
 #include <argp.h>
 #include <argz.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <error.h>
 #include <fcntl.h>
 #include <gcrypt.h>
@@ -252,7 +252,7 @@ gather_thread (void *args)
                                   + (float) random () / (float) RAND_MAX)));
     }
 
-  assert (! "reached");
+  assert_backtrace (! "reached");
 }
 
 error_t
diff --git a/trans/streamio.c b/trans/streamio.c
index 5539c8ea..f276ad6b 100644
--- a/trans/streamio.c
+++ b/trans/streamio.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include <string.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <argp.h>
@@ -74,11 +74,11 @@ static inline struct buffer *
 create_buffer (size_t size)
 {
   struct buffer *new = malloc (sizeof (struct buffer) + size);
-  assert (new);
+  assert_backtrace (new);
   new->head = new->tail = new->buf;
   new->size = size;
   new->wait = malloc (sizeof (pthread_cond_t));
-  assert (new->wait);
+  assert_backtrace (new->wait);
   pthread_cond_init (new->wait, NULL);
   return new;
 }
@@ -862,12 +862,12 @@ device_open_reply (mach_port_t reply, int returncode, mach_port_t device)
     }
   else if (err == 0)
     {
-      assert (sizes_len == DEV_GET_SIZE_COUNT);
+      assert_backtrace (sizes_len == DEV_GET_SIZE_COUNT);
 
       dev_blksize = sizes[DEV_GET_SIZE_RECORD_SIZE];
       dev_size = sizes[DEV_GET_SIZE_DEVICE_SIZE];
 
-      assert (dev_blksize && dev_blksize <= IO_INBAND_MAX);
+      assert_backtrace (dev_blksize && dev_blksize <= IO_INBAND_MAX);
     }
   else
     {
@@ -990,7 +990,7 @@ dev_read (size_t amount, void **buf, size_t *len, int nowait)
     vm_allocate (mach_task_self (), (vm_address_t *)buf, max, 1);
 
   *len = buffer_read (input_buffer, *buf, max);
-  assert (*len == max);
+  assert_backtrace (*len == max);
 
   err = start_input (nowait);
   return err;
@@ -1057,7 +1057,7 @@ start_output (int nowait)
 {
   int size;
 
-  assert (output_buffer);
+  assert_backtrace (output_buffer);
 
   size = buffer_size (output_buffer);