components/text-utilities/patches/parse.c.patch
author Rich Burridge <rich.burridge@oracle.com>
Sat, 24 Jan 2015 13:08:03 -0800
branchs11-update
changeset 3682 e7d4e4e72474
parent 3666 f6b2b3066ff4
child 3897 cd126ba3fdda
permissions -rw-r--r--
19731950 Work around Parfait CR #19730835
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3666
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
A printf format specifier of "qx" isn't supported on Solaris.
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
http://man7.org/linux/man-pages/man3/printf.3.html says:
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
  q   ("quad". 4.4BSD and Linux libc5 only.  Don't use.)  This is a
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
      synonym for ll.
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
This change will be sent upstream.
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
--- util-linux-2.24.2/text-utils/parse.c.orig	2014-06-04 13:04:47.338346633 -0700
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
+++ util-linux-2.24.2/text-utils/parse.c	2014-06-04 14:15:15.476415780 -0700
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
@@ -208,7 +208,7 @@
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
 	PR *pr, **nextpr;
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
 	FU *fu;
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
 	char *p1, *p2;
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
-	char savech, *fmtp, cs[3];
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
+	char savech, *fmtp, cs[4];
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
 	int nconv, prec;
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
 
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
 	nextpr = NULL;
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
@@ -282,9 +282,10 @@
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    22
 				goto isint;
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    23
 			case 'o': case 'u': case 'x': case 'X':
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    24
 				pr->flags = F_UINT;
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    25
-isint:				cs[2] = '\0';
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    26
-				cs[1] = cs[0];
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    27
-				cs[0] = 'q';
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    28
+isint:				cs[3] = '\0';
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    29
+				cs[2] = cs[0];
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    30
+				cs[1] = 'l';
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    31
+				cs[0] = 'l';
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    32
 				switch(fu->bcnt) {
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    33
 				case 0: case 4:
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    34
 					pr->bcnt = 4;
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    35
@@ -342,9 +343,10 @@
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    36
 					++p2;
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    37
 					switch(p1[2]) {
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    38
 					case 'd': case 'o': case'x':
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    39
-						cs[0] = 'q';
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    40
-						cs[1] = p1[2];
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    41
-						cs[2] = '\0';
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    42
+						cs[0] = 'l';
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    43
+						cs[1] = 'l';
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    44
+						cs[2] = p1[2];
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    45
+						cs[3] = '\0';
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    46
 						break;
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    47
 					default:
f6b2b3066ff4 PSARC 2014/170 text-utilities version 2.24.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    48
 						p1[3] = '\0';