X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/327719ee8a3fcdb36ed6acaf6d8cb5fbdf0bd801..80ddad17acad2466d0aa04f208d14f56a3fd2ff3:/lib-src/ebrowse.c
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 4ad45d195f..85def362de 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1,24 +1,24 @@
/* ebrowse.c --- parsing files for the ebrowse C++ browser
- Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99,
- 2000, 2001, 2002 Free Software Foundation Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ Free Software Foundation, Inc.
- This file is part of GNU Emacs.
+This file is part of GNU Emacs.
- GNU Emacs 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)
- any later version.
+GNU Emacs 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 3 of the License, or
+(at your option) any later version.
- GNU Emacs is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs. If not, see . */
- You should have received a copy of the GNU General Public License
- along with GNU Emacs; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
#ifdef HAVE_CONFIG_H
#include
@@ -533,6 +533,8 @@ struct sym *parse_qualified_ident_or_type P_ ((char **));
void parse_qualified_param_ident_or_type P_ ((char **));
int globals P_ ((int));
void yyerror P_ ((char *, char *));
+void usage P_ ((int)) NO_RETURN;
+void version P_ (()) NO_RETURN;
@@ -587,17 +589,6 @@ xrealloc (p, sz)
}
-/* Like free but always check for null pointers.. */
-
-void
-xfree (p)
- void *p;
-{
- if (p)
- free (p);
-}
-
-
/* Like strdup, but print an error and exit if not enough memory is
available.. If S is null, return null. */
@@ -648,7 +639,10 @@ add_sym (name, nested_in_class)
h %= TABLE_SIZE;
for (sym = class_table[h]; sym; sym = sym->next)
- if (streq (name, sym->name) && sym->namesp == scope)
+ if (streq (name, sym->name)
+ && ((!sym->namesp && !scope)
+ || (sym->namesp && scope
+ && streq (sym->namesp->name, scope->name))))
break;
if (sym == NULL)
@@ -2039,7 +2033,7 @@ matching_regexp ()
while (in - p < min_regexp && p > inbuffer)
{
/* Line probably not significant enough */
- for (--p; p >= inbuffer && *p != '\n'; --p)
+ for (--p; p > inbuffer && *p != '\n'; --p)
;
}
if (*p == '\n')
@@ -2754,7 +2748,7 @@ member (cls, vis)
if (LOOKING_AT ('{') && id && cls)
add_member_defn (cls, id, regexp, pos, hash, 0, sc, flags);
- xfree (id);
+ free (id);
id = NULL;
sc = SC_MEMBER;
break;
@@ -2833,7 +2827,7 @@ member (cls, vis)
print_info ();
}
- xfree (id);
+ free (id);
}
@@ -3070,7 +3064,7 @@ parse_qualified_ident_or_type (last_id)
cls = add_sym (id, cls);
*last_id = NULL;
- xfree (id);
+ free (id);
id = NULL;
id_size = 0;
MATCH ();
@@ -3273,7 +3267,7 @@ add_declarator (cls, id, flags, sc)
print_info ();
}
- xfree (*id);
+ free (*id);
*id = NULL;
*cls = NULL;
}
@@ -3326,7 +3320,7 @@ declaration (flags)
`declare (X, Y)\n class A : ...'. */
if (id)
{
- xfree (id);
+ free (id);
return;
}
@@ -3420,7 +3414,7 @@ declaration (flags)
if (!cls && id && LOOKING_AT ('{'))
add_global_defn (id, regexp, pos, hash, 0, sc, flags);
- xfree (id);
+ free (id);
id = NULL;
break;
}
@@ -3476,7 +3470,7 @@ globals (start_flags)
MATCH_IF ('}');
}
- xfree (namespace_name);
+ free (namespace_name);
}
}
break;
@@ -3685,8 +3679,11 @@ usage (error)
void
version ()
{
+ /* Makes it easier to update automatically. */
+ char emacs_copyright[] = "Copyright (C) 2009 Free Software Foundation, Inc.";
+
printf ("ebrowse %s\n", VERSION);
- puts ("Copyright (C) 1992-1999, 2000, 2001 Free Software Foundation, Inc.");
+ puts (emacs_copyright);
puts ("This program is distributed under the same terms as Emacs.");
exit (EXIT_SUCCESS);
}
@@ -3906,17 +3903,31 @@ main (argc, argv)
fp = fopen (out_filename, "r");
if (fp == NULL)
- yyerror ("file `%s' must exist for --append", out_filename);
+ {
+ yyerror ("file `%s' must exist for --append", out_filename);
+ exit (EXIT_FAILURE);
+ }
rc = fseek (fp, 0, SEEK_END);
if (rc == -1)
- yyerror ("error seeking in file `%s'", out_filename);
+ {
+ yyerror ("error seeking in file `%s'", out_filename);
+ exit (EXIT_FAILURE);
+ }
rc = ftell (fp);
if (rc == -1)
- yyerror ("error getting size of file `%s'", out_filename);
+ {
+ yyerror ("error getting size of file `%s'", out_filename);
+ exit (EXIT_FAILURE);
+ }
+
else if (rc == 0)
- yyerror ("file `%s' is empty", out_filename);
+ {
+ yyerror ("file `%s' is empty", out_filename);
+ /* It may be ok to use an empty file for appending.
+ exit (EXIT_FAILURE); */
+ }
fclose (fp);
}