summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch')
-rw-r--r--sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch42
1 files changed, 31 insertions, 11 deletions
diff --git a/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch b/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch
index 3adf1b8f90e8..ac9aa8c9dfd4 100644
--- a/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch
+++ b/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch
@@ -2,7 +2,7 @@ uClibc svn has l64a() support in it, but not uClibc 0.9.28 release
--- shadow-4.0.15/libmisc/salt.c
+++ shadow-4.0.15/libmisc/salt.c
-@@ -14,6 +14,32 @@
+@@ -14,6 +14,52 @@
#include "prototypes.h"
#include "defines.h"
#include "getdef.h"
@@ -13,21 +13,41 @@ uClibc svn has l64a() support in it, but not uClibc 0.9.28 release
+ * l64a - convert a long to a string of radix 64 characters
+ */
+
++static const char conv_table[64] =
++{
++ '.', '/', '0', '1', '2', '3', '4', '5',
++ '6', '7', '8', '9', 'A', 'B', 'C', 'D',
++ 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
++ 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
++ 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b',
++ 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
++ 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
++ 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
++};
++
+char *
-+l64a(long l)
++l64a (n)
++ long int n;
+{
-+ static char buf[8];
-+ int i = 0;
++ unsigned long int m = (unsigned long int) n;
++ static char result[7];
++ int cnt;
++
++ /* The standard says that only 32 bits are used. */
++ m &= 0xffffffff;
+
-+ if (l < 0L)
-+ return ((char *) 0);
++ if (m == 0ul)
++ /* The value for N == 0 is defined to be the empty string. */
++ return (char *) "";
+
-+ do {
-+ buf[i++] = i64c ((int) (l % 64));
-+ buf[i] = '\0';
-+ } while (l /= 64L, l > 0 && i < 6);
++ for (cnt = 0; m > 0ul; ++cnt)
++ {
++ result[cnt] = conv_table[m & 0x3f];
++ m >>= 6;
++ }
++ result[cnt] = '\0';
+
-+ return (buf);
++ return result;
+}
+
+#endif /* !HAVE_A64L */