assorted bug fixes

6 files changed, 25 insertions, 20 deletions

diff --git a/libidu/idfile.c b/libidu/idfile.c
index e377145..d27c4b3 100644
--- a/libidu/idfile.c
+++ b/libidu/idfile.c
@@ -85,8 +85,7 @@ locate_id_file_name (char const *arg)
       if (stat (file_name_buffer, &statb) != 0)
 	return NULL;
     }
-  while (!((statb.st_ino == rootb.st_ino) ||
-	   (statb.st_dev == rootb.st_dev)));
+  while (statb.st_ino != rootb.st_ino || statb.st_dev != rootb.st_dev);
   return NULL;
 }
 
diff --git a/libidu/scanners.c b/libidu/scanners.c
index af48c9f..fceeb1c 100644
--- a/libidu/scanners.c
+++ b/libidu/scanners.c
@@ -65,6 +65,7 @@ static void help_me_text __P((void));
 struct language languages_0[] =
 {
   { "C", parse_args_c, get_token_c, help_me_c },
+  { "C++", parse_args_c, get_token_c, help_me_c },
   { "asm", parse_args_asm, get_token_asm, help_me_asm },
   { "text", parse_args_text, get_token_text, help_me_text },
 };
diff --git a/src/fnid.c b/src/fnid.c
index 309480a..7b4610a 100644
--- a/src/fnid.c
+++ b/src/fnid.c
@@ -136,9 +136,10 @@ main (int argc, char **argv)
   argv += optind;
   if (argc == 0)
     {
-      static char *star = (char *) "*";
+      static char star[] = "*";
+      static char *starp = star;
       argc = 1;
-      argv = ☆
+      argv = &starp;
     }
 
   /* Look for the ID database up the tree */
diff --git a/src/lid.c b/src/lid.c
index 48bf11a..7971ff8 100644
--- a/src/lid.c
+++ b/src/lid.c
@@ -399,9 +399,10 @@ main (int argc, char **argv)
   argv += optind;
   if (argc == 0)
     {
-      static char *dot = (char *) ".";
+      static char dot[] = ".";
+      static char *dotp = dot;
       argc = 1;
-      argv = ˙
+      argv = &dotp;
     }
 
   /* Look for the ID database up the tree */
@@ -533,10 +534,9 @@ report_filenames (char const *name, struct file_link **flinkv)
 void
 report_grep (char const *name, struct file_link **flinkv)
 {
-  char line[BUFSIZ];
+  char line[1<<020];
   char const *pattern = 0;
   regex_t compiled;
-  int line_number;
 
   if (key_style == ks_pattern)
     {
@@ -554,32 +554,34 @@ report_grep (char const *name, struct file_link **flinkv)
 	}
     }
 
-  line[0] = ' ';		/* sentry */
+  line[0] = ' ';		/* sentinel */
   while (*flinkv)
     {
+      int line_number = 0;
       char *file_name = ALLOCA (char, PATH_MAX);
       FILE *gid_FILE;
 
       maybe_relative_file_name (file_name, *flinkv++, cw_dlink);
       gid_FILE = fopen (file_name, "r");
       if (gid_FILE == 0)
-	error (0, errno, "can't open `%s'", file_name);
+	{
+	  error (0, errno, "can't open `%s'", file_name);
+	  return;
+	}
 
-      line_number = 0;
-      while (fgets (&line[1], sizeof (line), gid_FILE))
+      while (fgets (line + 1, sizeof (line) - 1, gid_FILE))
 	{
 	  line_number++;
 	  if (pattern)
 	    {
 	      int regexec_errno = regexec (&compiled, line, 0, 0, 0);
 	      if (regexec_errno == REG_ESPACE)
-		error (0, 0, "can't match regular-expression: memory exhausted");
+		error (1, 0, "can't match regular-expression: memory exhausted");
 	      else if (regexec_errno)
 		continue;
 	    }
-	  else if (!word_match (name, line))
-	    continue;
-	  printf ("%s:%d:%s", file_name, line_number, &line[1]);
+	  else if (word_match (name, line))
+	    printf ("%s:%d:%s", file_name, line_number, line + 1);
 	}
       fclose (gid_FILE);
     }
diff --git a/src/mkid.c b/src/mkid.c
index c9d593b..2777178 100644
--- a/src/mkid.c
+++ b/src/mkid.c
@@ -259,9 +259,10 @@ main (int argc, char **argv)
   argv += optind;
   if (argc == 0)
     {
-      static char *dot = (char *) ".";
+      static char dot[] = ".";
+      static char *dotp = dot;
       argc = 1;
-      argv = &dot;
+      argv = &dotp;
     }
 
   language_getopt ();
diff --git a/src/xtokid.c b/src/xtokid.c
index 9299c00..5b1352c 100644
--- a/src/xtokid.c
+++ b/src/xtokid.c
@@ -149,9 +149,10 @@ main (int argc, char **argv)
   argv += optind;
   if (argc == 0)
     {
-      static char *dot = (char *) ".";
+      static char dot[] = ".";
+      static char *dotp = dot;
       argc = 1;
-      argv = &dot;
+      argv = &dotp;
     }
 
   language_getopt ();