[BACK]Return to patch-ag CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / ham / dpbox / patches

File: [cvs.NetBSD.org] / pkgsrc / ham / dpbox / patches / patch-ag (download)

Revision 1.2, Fri Apr 21 02:07:54 2006 UTC (14 years, 10 months ago) by wulf
Branch: MAIN
CVS Tags: pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2, pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4, pkgsrc-2007Q3-base, pkgsrc-2007Q3, pkgsrc-2007Q2-base, pkgsrc-2007Q2, pkgsrc-2007Q1-base, pkgsrc-2007Q1, pkgsrc-2006Q4-base, pkgsrc-2006Q4, pkgsrc-2006Q3-base, pkgsrc-2006Q3, pkgsrc-2006Q2-base, pkgsrc-2006Q2, cwrapper, cube-native-xorg-base, cube-native-xorg, HEAD
Changes since 1.1: +52 -5 lines

Implemented changes for this package to use the REQD_DIR and CONF_FILES
framework for the installation of the configuration files.
Fixed compile warning message due to implicit casting

$NetBSD: patch-ag,v 1.2 2006/04/21 02:07:54 wulf Exp $

--- tools.c.orig	2000-04-27 22:18:55.000000000 +0930
+++ tools.c	2006-04-14 11:57:42.000000000 +0930
@@ -72,12 +72,14 @@
 
 void conv_string_from_local(char *s)
 {
-  while (*s) *s++ = conv_umlaut_from_local(*s);
+  for (; *s; ++s)
+    *s = conv_umlaut_from_local(*s);
 }
 
 void conv_string_to_local(char *s)
 {
-  while (*s) *s++ = conv_umlaut_to_local(*s);
+  for (; *s; ++s)
+    *s = conv_umlaut_to_local(*s);
 }
 
 boolean conv_file_umlaut(boolean to_local, char *fname)
@@ -168,7 +170,7 @@
 #ifdef __macos__
   return (status);
 #endif
-#if defined(__linux__) || defined(__NetBSD__)
+#if defined(__linux__) || defined(__NetBSD__) || defined(__DragonFly__)
   return (statusconvert(status));
 #endif
 }
@@ -1221,11 +1223,11 @@
 
 static short iscalpha(char c)
 {
-  if (isupper(c))
+  if (isupper((u_char) c))
     return 1;
-  else if (isdigit(c))
+  else if (isdigit((u_char) c))
     return 0;
-  else if (islower(c))
+  else if (islower((u_char) c))
     return 1;
   else
     return -1;
@@ -2202,11 +2204,11 @@
     if (only_numbers) {
       do {
         c = dp_randomize(48, 57);
-      } while (!isdigit(c));
+      } while (!isdigit((u_char) c));
     } else {
       do {
         c = dp_randomize(48, 122);
-      } while (!isalnum(c));
+      } while (!isalnum((u_char) c));
     }
     sprintf(MDprompt + strlen(MDprompt), "%c", c);
   }
@@ -2349,7 +2351,7 @@
   upper(hs);
   p = hs;
   while (*p) {
-    if (!isupper(*p) && !isdigit(*p)) *p = '\0';
+    if (!isupper((u_char) *p) && !isdigit((u_char) *p)) *p = '\0';
     p++;
   }
   s = hs;
@@ -2840,7 +2842,7 @@
 
   for (TmpPtr = ConvStr; *OriginStr; TmpPtr++, OriginStr++)
     {
-      *TmpPtr = tolower(*OriginStr);
+      *TmpPtr = tolower((u_char) *OriginStr);
       if (*OriginStr < '0')  /* Satzzeichen neutralisieren   */
         *TmpPtr = ' ';
       else