Import of code from heimdal

This commit updates the code imported from heimdal to
8ce821c38744b30e226ff024f675668b991b984d (switch-from-svn-to-git-1998-g8ce821c)

Upstream changes are:

Asanka C. Herath (2):
      Revert use of backslash as an escape for double quote in config strings
      Condition roken's ssize_t definition for compatibility

Love Hornquist Astrand (1):
      don't undefined SLIST

Change-Id: I8855e060e88008f95eb2b24b029843081702fc04
Reviewed-on: http://gerrit.openafs.org/3761
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
This commit is contained in:
Heimdal Developers 2011-01-27 12:18:44 +00:00 committed by Jeffrey Altman
parent 962a95c21c
commit 29ef47dfab
4 changed files with 9 additions and 13 deletions

View File

@ -1 +1 @@
42f9c644cf00be752f09d85a9664bf2e3502101c 8ce821c38744b30e226ff024f675668b991b984d

View File

@ -877,12 +877,7 @@ next_component_string(char * begin, char * delims, char **state)
end = begin; end = begin;
while (*end == '"') { while (*end == '"') {
char * t; char * t = strchr(end + 1, '"');
while ((t = strchr(end + 1, '"')) != NULL && *(t - 1) == '\\') {
--t;
memmove(t, t + 1, strlen(t));
end = t;
}
if (t) if (t)
end = ++t; end = ++t;

View File

@ -150,11 +150,6 @@
#endif /* !_WIN32 */ #endif /* !_WIN32 */
/* Minimize conflict with WinNT.h */
#ifdef SLIST_ENTRY
#undef SLIST_ENTRY
#endif
#ifndef PATH_MAX #ifndef PATH_MAX
#define PATH_MAX MAX_PATH #define PATH_MAX MAX_PATH
#endif #endif

View File

@ -262,12 +262,18 @@ struct sockaddr_dl;
#endif #endif
#ifndef HAVE_SSIZE_T #ifndef HAVE_SSIZE_T
#ifndef SSIZE_T_DEFINED
#ifdef ssize_t
#undef ssize_t
#endif
#ifdef _WIN64 #ifdef _WIN64
typedef __int64 ssize_t; typedef __int64 ssize_t;
#else #else
typedef int ssize_t; typedef int ssize_t;
#endif #endif
#endif #define SSIZE_T_DEFINED
#endif /* SSIZE_T_DEFINED */
#endif /* HAVE_SSIZE_T */
#include <roken-common.h> #include <roken-common.h>