bug-bash
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Suggested patch for strftime for hpux10.20, hpux11.00


From: rdbrown
Subject: Suggested patch for strftime for hpux10.20, hpux11.00
Date: Wed, 3 Aug 2005 00:10:35 +1000
User-agent: Mutt/1.3.28i

Configuration Information [Automatically generated, do not change]:
Machine: hppa2.0n
OS: hpux11.00
Compiler: gcc
Compilation CFLAGS:  -DPROGRAM='bash' -DCONF_HOSTTYPE='hppa2.0n' 
-DCONF_OSTYPE='hpux11.00' -DCONF_MACHTYPE='hppa2.0n-hp-hpux11.00' 
-DCONF_VENDOR='hp' -DLOCALEDIR='/usr/local/share/locale' -DPACKAGE='bash' 
-DSHELL -DHAVE_CONFIG_H -DHPUX  -I.  -I. -I./include -I./lib  
-I/usr/local/include -g -O2
uname output: HP-UX S6393250 B.11.00 A 9000/785 2013328359 two-user license
Machine Type: hppa2.0n-hp-hpux11.00

Bash Version: 3.0
Patch Level: 16
Release Status: release

Description:
        bash-3.0 fails to build because lib/sh/strftime.c assumes
        that the altzone external is available on hpux11.00.
        hpux11.11 provides strftime so configure will find it.
        Prototype get_string_value for warning removal.

Fix:
--- lib/sh/strftime.c.orig      2005-08-03 00:02:38.000000000 +1000
+++ lib/sh/strftime.c   2005-07-31 00:22:30.000000000 +1000
@@ -95,12 +95,16 @@ static int iso8601wknum(const struct tm 
 #if !defined(OS2) && !defined(MSDOS) && defined(HAVE_TZNAME)
 extern char *tzname[2];
 extern int daylight;
-#if defined(SOLARIS) || defined(mips) || defined (M_UNIX)
+#if defined(SOLARIS) || defined(mips) || defined (M_UNIX) 
 extern long int timezone, altzone;
 #else
+#if defined(__hpux)
+extern long int timezone;
+#else
 extern int timezone, altzone;
 #endif
 #endif
+#endif
 
 #undef min     /* just in case */
 
@@ -137,6 +141,9 @@ strftime(char *s, size_t maxsize, const 
        static char *savetz = NULL;
        static int savetzlen = 0;
        char *tz;
+#if defined (SHELL)
+       extern char *get_string_value(const char *);
+#endif /* SHELL */
 #endif /* POSIX_SEMANTICS */
 #ifndef HAVE_TM_ZONE
 #ifndef HAVE_TM_NAME
@@ -480,7 +487,11 @@ strftime(char *s, size_t maxsize, const 
                         * Systems with tzname[] probably have timezone as
                         * secs west of GMT.  Convert to mins east of GMT.
                         */
+#if defined(__hpux)
+                       off = -timezone / 60;
+#else
                        off = -(daylight ? timezone : altzone) / 60;
+#endif
 #else /* !HAVE_TZNAME */
                        off = -zone.tz_minuteswest;
 #endif /* !HAVE_TZNAME */





reply via email to

[Prev in Thread] Current Thread [Next in Thread]