* etags.c (main): Don't barf on obsolete -t and -T switches.

	(main): Print an explicative message when a switch is not known.
	(takeprec): recognise the `character*(*) function' syntax.

1 files changed, 13 insertions, 9 deletions

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 6410c048931..e640fcdfeee 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -452,8 +452,8 @@ main (argc, argv)
 	case 'o':
 	  if (tagfile)
 	    {
-	      fprintf (stderr,
-		       "%s: -%c flag may only be given once\n", progname, opt);
+	      fprintf(stderr,
+		      "%s: -%c flag may only be given once.\n", progname, opt);
 	      goto usage;
 	    }
 	  tagfile = optarg;
@@ -467,6 +467,13 @@ main (argc, argv)
 	case 'H':
 	  print_help ();
 	  break;
+	case 't':
+	  typedefs++;
+	  break;
+	case 'T':
+	  typedefs++;
+	  typedefs_and_cplusplus++;
+	  break;
 
 #if (!CTAGS)
 
@@ -481,13 +488,6 @@ main (argc, argv)
 	case 'B':
 	  searchar = '?';
 	  break;
-	case 't':
-	  typedefs++;
-	  break;
-	case 'T':
-	  typedefs++;
-	  typedefs_and_cplusplus++;
-	  break;
 	case 'u':
 	  update++;
 	  break;
@@ -504,6 +504,8 @@ main (argc, argv)
 #endif /* CTAGS */
 
 	default:
+	  fprintf (stderr,
+		   "%s: -%c flag not recognised.\n", progname, opt);
 	  goto usage;
 	}
     }
@@ -2074,6 +2076,8 @@ takeprec ()
   dbp++;
   while (isspace (*dbp))
     dbp++;
+  if (tail ("(*)"))
+    return;
   if (!isdigit (*dbp))
     {
       --dbp;			/* force failure */