Portability: rename print.c::utoa() to rc_utoa() to avoid QNX name

  clash; use "sh -c 'test ...'" in trip.rc for missing standalone
  `test' on QNX (thanks Stefan Dalibor).

3 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 55ad726..78028b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -744,3 +744,9 @@ Changes since rc-1.5b2
 
   Bug: more wrongly ordered header file includes (thanks Callum
   Gibson).
+
+2001-11-06
+
+  Portability: rename print.c::utoa() to rc_utoa() to avoid QNX name
+  clash; use "sh -c 'test ...'" in trip.rc for missing standalone
+  `test' on QNX (thanks Stefan Dalibor).
diff --git a/print.c b/print.c
index ad939a0..3484086 100644
--- a/print.c
+++ b/print.c
@@ -69,9 +69,9 @@ static bool sconv(Format *format, int ignore) {
 	return FALSE;
 }
 
-static char *utoa(unsigned long u, char *t, unsigned int radix, const char *digit) {
+static char *rc_utoa(unsigned long u, char *t, unsigned int radix, const char *digit) {
 	if (u >= radix) {
-		t = utoa(u / radix, t, radix, digit);
+		t = rc_utoa(u / radix, t, radix, digit);
 		u %= radix;
 	}
 	*t++ = digit[u];
@@ -117,7 +117,7 @@ static void intconv(Format *format, unsigned int radix, int upper, const char *a
 		while (*altform != '\0')
 			prefix[pre++] = *altform++;
 
-	len = utoa(u, number, radix, table[upper]) - number;
+	len = rc_utoa(u, number, radix, table[upper]) - number;
 	if ((flags & FMT_f2set) && (size_t) format->f2 > len)
 		zeroes = format->f2 - len;
 	else
diff --git a/trip.rc b/trip.rc
index b8e7e58..8eb4c09 100644
--- a/trip.rc
+++ b/trip.rc
@@ -352,7 +352,7 @@ if (~ x [y])
 if (~ x x?)
 	fail too many characters in pattern
 
-test -f /////tmp//////a?c.$pid || fail glob with many slashes
+sh -c 'test -f /////tmp//////a?c.'^$pid || fail glob with many slashes
 if (!~ /////tmp//////a*.$pid /////tmp//////a?c.$pid)
 	fail glob with many slashes
 if (!~ ////tmp////di?.$pid////* ////tmp////dir.$pid////*b*)