4 files changed, 148 insertions, 50 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2c178ba8da9..2cc37d49dd4 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,40 @@
+2007-11-28  Jason Rumney  <jasonr@gnu.org>
+
+        * makefile.w32-in (VMS_SUPPORT): No longer byte-compiled.
+
+2007-11-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * pop.c (socket_connection): Remove AI_ADDRCONFIG.
+
+2007-11-19  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * pop.c (socket_connection): Move realhost out of #ifdefs.
+        Set realhost both for HAVE_GETADDRINFO and !HAVE_GETADDRINFO.
+
+2007-11-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * pop.c (socket_connection): Use getaddrinfo if available.
+
+2007-11-22  Francesco Potort,Al(B  <pot@gnu.org>
+
+        * etags.c (default_C_help) [CTAGS]: differentiate the help string,
+        as the defaults in ctags are different from etags.
+
+2007-11-15  Francesco Potort,Al(B  <pot@gnu.org>
+
+        * etags.c: Make prototypes for extern definitions, and add all
+        that are needed to quench warnings on 64-bit.
+        (main): Use the same defaults for ctags as for etags: find
+        typedefs, structure tags, macro constants, enum constants, struct
+        members and global variables.
+        (make_C_tag) [DEBUG]: Add debugging printout.
+        (C_entries): In case '}' decrement bracelev before testing it.
+
+2007-11-15  Masatake YAMATO  <jet@gyve.org>
+
+        * etags.c (C_entries): In case '}', set fvdef to fvnone
+        unconditioned to (!ignoreindent && lp == newlb.buffer + 1).
+
 2007-11-01  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * makefile.w32-in (obj): Remove sunfns.o.
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 0412137496f..23527171e48 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -81,7 +81,7 @@ University of California, as described above. */
  * configuration file containing regexp definitions for etags.
  */
 
-char pot_etags_version[] = "@(#) pot revision number is 17.34";
+char pot_etags_version[] = "@(#) pot revision number is 17.38";
 
 #define TRUE    1
 #define FALSE   0
@@ -160,14 +160,20 @@ char pot_etags_version[] = "@(#) pot revision number is 17.34";
 #  include <stdlib.h>
 #  include <string.h>
 # else /* no standard C headers */
-   extern char *getenv ();
-   extern char *strcpy ();
-   extern char *strncpy ();
-   extern char *strcat ();
-   extern char *strncat ();
-   extern unsigned long strlen ();
-   extern PTR malloc ();
-   extern PTR realloc ();
+   extern char *getenv __P((const char *));
+   extern char *strcpy __P((char *, const char *));
+   extern char *strncpy __P((char *, const char *, unsigned long));
+   extern char *strcat __P((char *, const char *));
+   extern char *strncat __P((char *, const char *, unsigned long));
+   extern int strcmp __P((const char *, const char *));
+   extern int strncmp __P((const char *, const char *, unsigned long));
+   extern int system __P((const char *));
+   extern unsigned long strlen __P((const char *));
+   extern void *malloc __P((unsigned long));
+   extern void *realloc __P((void *, unsigned long));
+   extern void exit __P((int));
+   extern void free __P((void *));
+   extern void *memmove __P((void *, const void *, unsigned long));
 #  ifdef VMS
 #   define EXIT_SUCCESS 1
 #   define EXIT_FAILURE 0
@@ -491,7 +497,7 @@ static char
   *midtk = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz$0123456789";
 
 static bool append_to_tagfile;  /* -a: append to tags */
-/* The next five default to TRUE for etags, but to FALSE for ctags.  */
+/* The next five default to TRUE in C and derived languages.  */
 static bool typedefs;           /* -t: create tags for C and Ada typedefs */
 static bool typedefs_or_cplusplus; /* -T: create tags for C typedefs, level */
                                 /* 0 struct/enum/union decls, and C++ */
@@ -508,7 +514,7 @@ static bool update;		/* -u: update tags */
 static bool vgrind_style;       /* -v: create vgrind style index output */
 static bool no_warnings;        /* -w: suppress warnings (undocumented) */
 static bool cxref_style;        /* -x: create cxref style output */
-static bool cplusplus;          /* .[hc] means C++, not C */
+static bool cplusplus;          /* .[hc] means C++, not C (undocumented) */
 static bool ignoreindent;       /* -I: ignore indentation in C */
 static bool packages_only;      /* --packages-only: in Ada, only tag packages*/
 
@@ -615,10 +621,19 @@ followed by a colon, are tags.";
 
 
 /* Note that .c and .h can be considered C++, if the --c++ flag was
-   given, or if the `class' or `template' keyowrds are met inside the file.
+   given, or if the `class' or `template' keywords are met inside the file.
    That is why default_C_entries is called for these. */
 static char *default_C_suffixes [] =
   { "c", "h", NULL };
+#if CTAGS                               /* C help for Ctags */
+static char default_C_help [] =
+"In C code, any C function is a tag.  Use -t to tag typedefs.\n\
+Use -T to tag definitions of `struct', `union' and `enum'.\n\
+Use -d to tag `#define' macro definitions and `enum' constants.\n\
+Use --globals to tag global variables.\n\
+You can tag function declarations and external variables by\n\
+using `--declarations', and struct members by using `--members'.";
+#else                                   /* C help for Etags */
 static char default_C_help [] =
 "In C code, any C function or typedef is a tag, and so are\n\
 definitions of `struct', `union' and `enum'.  `#define' macro\n\
@@ -629,6 +644,7 @@ definitions and `enum' constants are tags unless you specify\n\
 `--no-members' can make the tags table file much smaller.\n\
 You can tag function declarations and external variables by\n\
 using `--declarations'.";
+#endif  /* C help for Ctags and Etags */
 
 static char *Cplusplus_suffixes [] =
   { "C", "c++", "cc", "cpp", "cxx", "H", "h++", "hh", "hpp", "hxx",
@@ -883,7 +899,7 @@ etags --help --lang=ada.");
 # define EMACS_NAME "standalone"
 #endif
 #ifndef VERSION
-# define VERSION "17.34"
+# define VERSION "17.38"
 #endif
 static void
 print_version ()
@@ -1239,15 +1255,12 @@ main (argc, argv)
   argbuffer = xnew (argc, argument);
 
   /*
-   * If etags, always find typedefs and structure tags.  Why not?
+   * Always find typedefs and structure tags.
    * Also default to find macro constants, enum constants, struct
-   * members and global variables.
+   * members and global variables.  Do it for both etags and ctags.
    */
-  if (!CTAGS)
-    {
-      typedefs = typedefs_or_cplusplus = constantypedefs = TRUE;
-      globals = members = TRUE;
-    }
+  typedefs = typedefs_or_cplusplus = constantypedefs = TRUE;
+  globals = members = TRUE;
 
   /* When the optstring begins with a '-' getopt_long does not rearrange the
      non-options arguments to be at the end, but leaves them alone. */
@@ -1498,6 +1511,7 @@ main (argc, argv)
       exit (EXIT_SUCCESS);
     }
 
+  /* From here on, we are in (CTAGS && !cxref_style) */
   if (update)
     {
       char cmd[BUFSIZ];
@@ -3006,11 +3020,6 @@ consider_token (str, len, c, c_extp, bracelev, parlev, is_func_or_var)
        return TRUE;
      }
 
-   /*
-    * This structdef business is NOT invoked when we are ctags and the
-    * file is plain C.  This is because a struct tag may have the same
-    * name as another tag, and this loses with ctags.
-    */
    switch (toktype)
      {
      case st_C_javastruct:
@@ -3246,16 +3255,16 @@ make_C_tag (isfun)
 {
   /* This function is never called when token.valid is FALSE, but
      we must protect against invalid input or internal errors. */
-  if (!DEBUG && !token.valid)
-    return;
-
   if (token.valid)
     make_tag (token_name.buffer, token_name.len, isfun, token.line,
               token.offset+token.length+1, token.lineno, token.linepos);
-  else                          /* this case is optimised away if !DEBUG */
-    make_tag (concat ("INVALID TOKEN:-->", token_name.buffer, ""),
-              token_name.len + 17, isfun, token.line,
-              token.offset+token.length+1, token.lineno, token.linepos);
+  else if (DEBUG)
+    {                             /* this branch is optimised away if !DEBUG */
+      make_tag (concat ("INVALID TOKEN:-->", token_name.buffer, ""),
+                token_name.len + 17, isfun, token.line,
+                token.offset+token.length+1, token.lineno, token.linepos);
+      error ("INVALID TOKEN", NULL);
+    }
 
   token.valid = FALSE;
 }
@@ -3978,7 +3987,7 @@ C_entries (c_ext, inf)
               make_C_tag (FALSE);  /* a struct or enum */
               break;
             }
-          bracelev++;
+          bracelev += 1;
           break;
         case '*':
           if (definedef != dnone)
@@ -3992,23 +4001,21 @@ C_entries (c_ext, inf)
         case '}':
           if (definedef != dnone)
             break;
+          bracelev -= 1;
           if (!ignoreindent && lp == newlb.buffer + 1)
             {
               if (bracelev != 0)
-                token.valid = FALSE;
+                token.valid = FALSE; /* unexpected value, token unreliable */
               bracelev = 0;     /* reset brace level if first column */
               parlev = 0;       /* also reset paren level, just in case... */
             }
-          else
+          else if (bracelev < 0)
             {
-              if (--bracelev < 0)
-                {
-                  bracelev = 0;
-                  token.valid = FALSE; /* something gone amiss, token unreliable */
-                }
-              if (bracelev == 0 && fvdef == vignore)
-                fvdef = fvnone;         /* end of function */
+              token.valid = FALSE; /* something gone amiss, token unreliable */
+              bracelev = 0;
             }
+          if (bracelev == 0 && fvdef == vignore)
+            fvdef = fvnone;             /* end of function */
           popclass_above (bracelev);
           structdef = snone;
           /* Only if typdef == tinbody is typdefbracelev significant. */
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 8e01c9dfeaf..8b327bfabf8 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -187,8 +187,8 @@ MSDOS_SUPPORT = \
         $(lispsource)international/ccl.elc \
         $(lispsource)international/codepage.elc
 VMS_SUPPORT = \
-        $(lispsource)vmsproc.elc \
-        $(lispsource)vms-patch.elc
+        $(lispsource)vmsproc.el \
+        $(lispsource)vms-patch.el
 TOOLTIP_SUPPORT = $(lispsource)tooltip.elc
 WINDOW_SUPPORT = \
         $(lispsource)fringe.elc \
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 9fcbe4b370c..5e6623aaf8d 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1010,12 +1010,19 @@ socket_connection (host, flags)
      char *host;
      int flags;
 {
+#ifdef HAVE_GETADDRINFO
+  struct addrinfo *res, *it;
+  struct addrinfo hints;
+  int ret;
+#else /* !HAVE_GETADDRINFO */
   struct hostent *hostent;
+#endif
   struct servent *servent;
   struct sockaddr_in addr;
   char found_port = 0;
   char *service;
   int sock;
+  char *realhost;
 #ifdef KERBEROS
 #ifdef KERBEROS5
   krb5_error_code rem;
@@ -1031,11 +1038,11 @@ socket_connection (host, flags)
   CREDENTIALS cred;
   Key_schedule schedule;
   int rem;
-  char *realhost;
 #endif /* KERBEROS5 */
 #endif /* KERBEROS */
 
   int try_count = 0;
+  int connect_ok;
 
 #ifdef WINDOWSNT
   {
@@ -1097,6 +1104,46 @@ socket_connection (host, flags)
 
     }
 
+#ifdef HAVE_GETADDRINFO
+  memset (&hints, 0, sizeof(hints));
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_flags = AI_CANONNAME;
+  hints.ai_family = AF_INET;
+  do
+    {
+      ret = getaddrinfo (host, service, &hints, &res);
+      try_count++;
+      if (ret != 0 && (ret != EAI_AGAIN || try_count == 5))
+        {
+          strcpy (pop_error, "Could not determine POP server's address");
+          return (-1);
+        }
+    } while (ret != 0);
+
+  if (ret == 0)
+    {
+      it = res;
+      while (it)
+        {
+          if (it->ai_addrlen == sizeof (addr))
+            {
+              struct sockaddr_in *in_a = (struct sockaddr_in *) it->ai_addr;
+              bcopy (&in_a->sin_addr, (char *) &addr.sin_addr,
+                     sizeof (addr.sin_addr));
+              if (! connect (sock, (struct sockaddr *) &addr, sizeof (addr)))
+                break;
+            }
+          it = it->ai_next;
+        }
+      connect_ok = it != NULL;
+      if (connect_ok)
+        {
+          realhost = alloca (strlen (it->ai_canonname) + 1);
+          strcpy (realhost, it->ai_canonname);
+        }
+      freeaddrinfo (res);
+    }
+#else /* !HAVE_GETADDRINFO */
   do
     {
       hostent = gethostbyname (host);
@@ -1116,10 +1163,18 @@ socket_connection (host, flags)
         break;
       hostent->h_addr_list++;
     }
+  connect_ok = *hostent->h_addr_list != NULL;
+  if (! connect_ok)
+    {
+      realhost = alloca (strlen (hostent->h_name) + 1);
+      strcpy (realhost, hostent->h_name);
+    }
+
+#endif /* !HAVE_GETADDRINFO */
 
 #define CONNECT_ERROR "Could not connect to POP server: "
 
-  if (! *hostent->h_addr_list)
+  if (! connect_ok)
     {
       CLOSESOCKET (sock);
       strcpy (pop_error, CONNECT_ERROR);
@@ -1130,6 +1185,7 @@ socket_connection (host, flags)
     }
 
 #ifdef KERBEROS
+
 #define KRB_ERROR "Kerberos error connecting to POP server: "
   if (! (flags & POP_NO_KERBEROS))
     {
@@ -1157,7 +1213,7 @@ socket_connection (host, flags)
       if (rem = krb5_cc_get_principal (kcontext, ccdef, &client))
         goto krb5error;
 
-      for (cp = hostent->h_name; *cp; cp++)
+      for (cp = realhost; *cp; cp++)
         {
           if (isupper (*cp))
             {
@@ -1165,7 +1221,7 @@ socket_connection (host, flags)
             }
         }
 
-      if (rem = krb5_sname_to_principal (kcontext, hostent->h_name,
+      if (rem = krb5_sname_to_principal (kcontext, realhost,
                                          POP_SERVICE, FALSE, &server))
         goto krb5error;
 
@@ -1210,7 +1266,6 @@ socket_connection (host, flags)
         }
 #else  /* ! KERBEROS5 */
       ticket = (KTEXT) malloc (sizeof (KTEXT_ST));
-      realhost = strdup (hostent->h_name);
       rem = krb_sendauth (0L, sock, ticket, "pop", realhost,
                           (char *) krb_realmofhost (realhost),
                           (unsigned long) 0, &msg_data, &cred, schedule,
@@ -1218,7 +1273,6 @@ socket_connection (host, flags)
                           (struct sockaddr_in *) 0,
                           "KPOPV0.1");
       free ((char *) ticket);
-      free (realhost);
       if (rem != KSUCCESS)
         {
           strcpy (pop_error, KRB_ERROR);