Merge from trunk

11 files changed, 96 insertions, 54 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 1b6a16dd524..6ac9bf19a24 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,47 @@
+2010-08-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ebrowse.c (usage, version, mark_virtual):
+        Remove duplicate declarations.
+
+2010-08-06  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * emacsclient.c: Move socket related #includes together with the
+        rest of the #includes.  Move a WINDOWSNT includes closer together.
+        (HAVE_CONFIG_H): Remove.
+        (NO_RETURN): Remove, defined in config.h.
+        (main): Convert definition to standard C.
+
+2010-07-29  Juanma Barranquero  <lekktu@gmail.com>
+
+        * make-docfile.c (write_c_args): Warn for old-style empty arglist ().
+
+2010-07-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacsclient.c (getcwd): Fix previous change: make getcwd
+        conditional on HAVE_GETCWD and declare with the correct POSIX
+        profile (for some reason MinGW headers define its 2nd arg as int,
+        not size_t; but getcwd is not used on Windows nonetheless).
+
+2010-07-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacsclient.c (getcwd, w32_getenv):
+        * ntlib.h (getlogin, getuid, getegid, getgid): Fix prototypes.
+
+2010-07-24  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * update-game-score.c (usage): Add NO_RETURN specifier.
+        * movemail.c (fatal, pfatal_with_name, pfatal_and_delete):
+        * make-docfile.c (fatal):
+        * hexl.c (usage):
+        * fakemail.c (fatal):
+        * etags.c (fatal, suggest_asking_for_help, pfatal):
+        * emacsclient.c (fatal):
+        * b2m.c (fatal): Likewise.
+
+2010-07-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * make-docfile.c (write_c_args): Correctly handle prefixes of "defalt".
+
 2010-07-20  Juanma Barranquero  <lekktu@gmail.com>
 
         * emacsclient.c (get_current_dir_name, w32_get_resource)
@@ -775,7 +819,7 @@
 
 2008-02-01  Jason Rumney  <jasonr@gnu.org>
 
-        * makefile.w32-in (obj): Sync with src/Makefile.in
+        * makefile.w32-in (obj): Sync with src/Makefile.in.
         (TOOLTIP_SUPPORT, WINDOW_SUPPORT): New definitions.
         (WINNT_SUPPORT): Add term/w32-win.elc.
         (lisp1, lisp2): Sync with lisp in src/Makefile.in.
@@ -2471,7 +2515,7 @@
 
         * makefile.w32-in (WINNT_SUPPORT, MOUSE_SUPPORT, lisp): Revert to
         using .elc files.
-        (lisp): Sync with list in src/Makefile.in
+        (lisp): Sync with list in src/Makefile.in.
         (VMS_SUPPORT, MSDOS_SUPPORT): Define, so DOC files can be shared.
 
 2002-02-10  Paul Eggert  <eggert@twinsun.com>
@@ -6313,7 +6357,7 @@
         (TOKEN): Member linestart removed.
         (linepos, prev_linepos, lb1): Deleted.
         (main): Call initbuffer on lbs array instead of lb1.
-        (init): Removed the initialisation of the logical _gd array;
+        (init): Removed the initialisation of the logical _gd array.
         (find_entries): A .sa suffix means assembler file.
         (C_create_stab): "auto", "void", "extern", "static" are st_C_typespec.
         All C state machines rewritten.
@@ -7177,7 +7221,7 @@
         * etags.c: Changes for VMS.
         Always define ETAGS on VMS.
         Define macros GOOD and BAD for success and failure exit codes.
-        (begtk, intk): Allow `$' in identifiers
+        (begtk, intk): Allow `$' in identifiers.
         (main): Don't support -B, -F or -u on VMS.
         Alternate loop for scanning filename arguments.
         (system): Delete definition of this function.
diff --git a/lib-src/b2m.c b/lib-src/b2m.c
index 733cd276653..f31b33f9780 100644
--- a/lib-src/b2m.c
+++ b/lib-src/b2m.c
@@ -70,7 +70,7 @@ long *xmalloc (unsigned int size);
 long *xrealloc (char *ptr, unsigned int size);
 char *concat (char *s1, char *s2, char *s3);
 long readline (struct linebuffer *linebuffer, register FILE *stream);
-void fatal (char *message);
+void fatal (char *message) NO_RETURN;
 
 /*
  * xnew -- allocate storage.  SYNOPSIS: Type *xnew (int n, Type);
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index a9f7ba4f3a7..40e72939429 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -492,8 +492,6 @@ void register_namespace_alias (char *, struct link *);
 void insert_keyword (char *, int);
 void re_init_scanner (void);
 void init_scanner (void);
-void usage (int);
-void version (void);
 void process_file (char *);
 void add_search_path (char *);
 FILE *open_file (char *);
@@ -504,7 +502,6 @@ int dump_tree (FILE *, struct sym *);
 struct member *find_member (struct sym *, char *, int, int, unsigned);
 struct member *add_member (struct sym *, char *, int, int, unsigned);
 void mark_virtual (struct sym *);
-void mark_virtual (struct sym *);
 struct sym *make_namespace (char *, struct sym *);
 char *sym_scope (struct sym *);
 char *sym_scope_1 (struct sym *);
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index bafc7e02720..cbc1dfe3f6a 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -18,9 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #ifdef WINDOWSNT
 
@@ -32,6 +30,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 # include <stdlib.h>
 # include <windows.h>
 # include <commctrl.h>
+# include <io.h>
+# include <winsock2.h>
 
 # define NO_SOCKETS_IN_FILE_SYSTEM
 
@@ -45,8 +45,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 # ifdef HAVE_INET_SOCKETS
 #  include <netinet/in.h>
+#  ifdef HAVE_SOCKETS
+#    include <sys/types.h>
+#    include <sys/socket.h>
+#    include <sys/un.h>
+#  endif /* HAVE_SOCKETS */
 # endif
-
 # include <arpa/inet.h>
 
 # define INVALID_SOCKET -1
@@ -67,25 +71,23 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include "getopt.h"
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
-#ifdef WINDOWSNT
-# include <io.h>
-#else /* not WINDOWSNT */
-# include <pwd.h>
-#endif /* not WINDOWSNT */
+#include <pwd.h>
 #include <sys/stat.h>
-
 #include <signal.h>
 #include <errno.h>
 
+
 
 char *getenv (const char *), *getwd (char *);
-char *(getcwd) ();
+#ifdef HAVE_GETCWD
+char *(getcwd) (char *, size_t);
+#endif
 
 #ifdef WINDOWSNT
-char *w32_getenv ();
+char *w32_getenv (char *);
 #define egetenv(VAR) w32_getenv(VAR)
 #else
 #define egetenv(VAR) getenv(VAR)
@@ -112,10 +114,6 @@ char *w32_getenv ();
 #define TRUE 1
 #endif
 
-#ifndef NO_RETURN
-#define NO_RETURN
-#endif
-
 /* Additional space when allocating buffers for filenames, etc.  */
 #define EXTRA_SPACE 100
 
@@ -158,6 +156,8 @@ char *server_file = NULL;
 int emacs_pid = 0;
 
 void print_help_and_exit (void) NO_RETURN;
+void fail (void) NO_RETURN;
+
 
 struct option longopts[] =
 {
@@ -400,7 +400,7 @@ w32_set_user_model_id (void)
   /* On Windows 7 and later, we need to set the user model ID
      to associate emacsclient launched files with Emacs frames
      in the UI.  */
-  shell = LoadLibrary("shell32.dll");
+  shell = LoadLibrary ("shell32.dll");
   if (shell)
     {
       set_user_model
@@ -430,7 +430,7 @@ w32_window_app (void)
          nonconsole apps.  Testing for the console title seems to work. */
       window_app = (GetConsoleTitleA (szTitle, MAX_PATH) == 0);
       if (window_app)
-        InitCommonControls();
+        InitCommonControls ();
     }
 
   return window_app;
@@ -481,7 +481,7 @@ ttyname (int fd)
 void
 message (int is_error, char *message, ...)
 {
-  char msg [2048];
+  char msg[2048];
   va_list args;
 
   va_start (args, message);
@@ -698,9 +698,7 @@ fail (void)
 #if !defined (HAVE_SOCKETS) || !defined (HAVE_INET_SOCKETS)
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   main_argv = argv;
   progname = argv[0];
@@ -712,14 +710,6 @@ main (argc, argv)
 
 #else /* HAVE_SOCKETS && HAVE_INET_SOCKETS */
 
-#ifdef WINDOWSNT
-# include <winsock2.h>
-#else
-# include <sys/types.h>
-# include <sys/socket.h>
-# include <sys/un.h>
-#endif
-
 #define AUTH_KEY_LENGTH      64
 #define SEND_BUFFER_SIZE   4096
 
@@ -1468,7 +1458,7 @@ start_daemon_and_retry_set_socket (void)
       pid_t w;
       w = waitpid (dpid, &status, WUNTRACED | WCONTINUED);
 
-      if ((w == -1) || !WIFEXITED (status) || WEXITSTATUS(status))
+      if ((w == -1) || !WIFEXITED (status) || WEXITSTATUS (status))
         {
           message (TRUE, "Error: Could not start the Emacs daemon\n");
           exit (EXIT_FAILURE);
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 79475fe9922..b78686dde57 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -406,9 +406,9 @@ static void analyse_regex (char *);
 static void free_regexps (void);
 static void regex_tag_multiline (void);
 static void error (const char *, const char *);
-static void suggest_asking_for_help (void);
-void fatal (char *, char *);
-static void pfatal (char *);
+static void suggest_asking_for_help (void) NO_RETURN;
+void fatal (char *, char *) NO_RETURN;
+static void pfatal (char *) NO_RETURN;
 static void add_node (node *, node **);
 
 static void init (void);
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index f4d978b7d11..72e1b7179c0 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -147,6 +147,8 @@ static line_list file_preface;
 static stream_list the_streams;
 static boolean no_problems = true;
 
+static void fatal (char *s1) NO_RETURN;
+
 extern FILE *popen (const char *, const char *);
 extern int fclose (FILE *), pclose (FILE *);
 
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index d730cac6814..b31ab812534 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -49,7 +49,7 @@ int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1;
 int group_by = DEFAULT_GROUPING;
 char *progname;
 
-void usage(void);
+void usage(void) NO_RETURN;
 
 int
 main (int argc, char **argv)
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 51c30f91d8f..7fe63bed506 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -70,6 +70,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 int scan_file (char *filename);
 int scan_lisp_file (char *filename, char *mode);
 int scan_c_file (char *filename, char *mode);
+void fatal (char *s1, char *s2) NO_RETURN;
 
 #ifdef MSDOS
 /* s/msdos.h defines this as sys_chdir, but we're not linking with the
@@ -441,7 +442,7 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
   register char *p;
   int in_ident = 0;
   char *ident_start;
-  int ident_length;
+  int ident_length = 0;
 
   fprintf (out, "(fn");
 
@@ -475,6 +476,12 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
          identifier.  */
       if (c == ',' || c == ')')
         {
+          if (ident_length == 0)
+            {
+              error ("empty arg list for `%s' should be (void), not ()", func);
+              continue;
+            }
+
           if (strncmp (ident_start, "void", ident_length) == 0)
             continue;
 
@@ -488,7 +495,7 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
 
           /* In C code, `default' is a reserved word, so we spell it
              `defalt'; unmangle that here.  */
-          if (strncmp (ident_start, "defalt", ident_length) == 0)
+          if (ident_length == 6 && strncmp (ident_start, "defalt", 6) == 0)
             fprintf (out, "DEFAULT");
           else
             while (ident_length-- > 0)
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 541edf545df..bb4a922014c 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -147,10 +147,10 @@ static char *mail_spool_name ();
 char *strerror (int);
 #endif
 
-static void fatal (char *s1, char *s2, char *s3);
+static void fatal (char *s1, char *s2, char *s3) NO_RETURN;
 static void error (char *s1, char *s2, char *s3);
-static void pfatal_with_name (char *name);
-static void pfatal_and_delete (char *name);
+static void pfatal_with_name (char *name) NO_RETURN;
+static void pfatal_and_delete (char *name) NO_RETURN;
 static char *concat (char *s1, char *s2, char *s3);
 static long *xmalloc (unsigned int size);
 #ifdef MAIL_USE_POP
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index fd51269fdfd..4dd6a32ee32 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -30,14 +30,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef sleep
 #undef sleep
 #endif
-void sleep(unsigned long seconds);
+void sleep (unsigned long seconds);
 char *getwd (char *dir);
-int getppid(void);
-char * getlogin ();
+int getppid (void);
+char * getlogin (void);
 char * cuserid (char * s);
-unsigned getuid ();
-unsigned getegid ();
-unsigned getgid ();
+unsigned getuid (void);
+unsigned getegid (void);
+unsigned getgid (void);
 int setuid (unsigned uid);
 int setegid (unsigned gid);
 char * getpass (const char * prompt);
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index a96422a09a9..30208d5c8d2 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -60,6 +60,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 extern char *optarg;
 extern int optind, opterr;
 
+int usage (int err) NO_RETURN;
+
 #define MAX_ATTEMPTS 5
 #define MAX_SCORES 200
 #define MAX_DATA_LEN 1024