[test-suite] Fix unix-smail symbol clash with the symbols in libc when linking statically.

[mstojanovic]

Summary

Test unix-smail fails when compiling with --static flag. Adding a prefix to getopt, optind and opterr in order to avoid clashing with libc while linking.

[MatzeB]

Does this work with all linkers? I don't see this document in the manpage of apples ld64.

[MatzeB]

I'd be fine with renaming the functions in the benchmark.

[mstojanovic]

This was only tested with gcc for mips and x86_64 but renaming the function and the variables would be a more general solution.

[joelkevinjones]

Since I don't perceive a requirement that the benchmark source continue to exactly match that of the original, I would prefer just changing the benchmark source to not conflict.

[mstojanovic]

Added unix-smail_ prefix to function getopt and variables optind and opterr.

[MatzeB]

LGTM, thanks.

test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-smail/getopt.c

  * However, I am not about to post a copy of anything licensed by AT&T.
  */
 
 /* This include is needed only to get "index" defined as "strchr" on Sys V. */
 #include "defs.h"
 #include <strings.h>
 
 /*LINTLIBRARY*/
-#define ERR(s, c) if(opterr){\
+#define ERR(s, c) if(unix_smail_opterr){\
   extern int write();\
   char errbuf[2];\
   errbuf[0] = c; errbuf[1] = '\n';\
   (void) write(2, argv[0], (unsigned)strlen(argv[0]));\
   (void) write(2, s, (unsigned)strlen(s));\
   (void) write(2, errbuf, 2);}
 
-int opterr = 1;
-int optind = 1;
+int unix_smail_opterr = 1;
+int unix_smail_optind = 1;
 int optopt;
 char  *optarg;
 #define EOF (-1)
 
-int getopt(int argc,char **argv,char *opts)
+int unix_smail_getopt(int argc,char **argv,char *opts)
 {
   static int sp = 1;
   register int c;
   register char *cp;
 
   if(sp == 1)
-    if(optind >= argc ||
-       argv[optind][0] != '-' || argv[optind][1] == '\0')
+    if(unix_smail_optind >= argc ||
+       argv[unix_smail_optind][0] != '-' || argv[unix_smail_optind][1] == '\0')
       return(EOF);
-    else if(strcmp(argv[optind], "--") == NULL) {
-      optind++;
+    else if(strcmp(argv[unix_smail_optind], "--") == NULL) {
+      unix_smail_optind++;
       return(EOF);
     }
-  optopt = c = argv[optind][sp];
+  optopt = c = argv[unix_smail_optind][sp];
   if(c == ':' || (cp=index(opts, c)) == NULL) {
     ERR(": illegal option -- ", c);
-    if(argv[optind][++sp] == '\0') {
-      optind++;
+    if(argv[unix_smail_optind][++sp] == '\0') {
+      unix_smail_optind++;
       sp = 1;
     }
     return('?');
   }
   if(*++cp == ':') {
-    if(argv[optind][sp+1] != '\0')
-      optarg = &argv[optind++][sp+1];
-    else if(++optind >= argc) {
+    if(argv[unix_smail_optind][sp+1] != '\0')
+      optarg = &argv[unix_smail_optind++][sp+1];
+    else if(++unix_smail_optind >= argc) {
       ERR(": option requires an argument -- ", c);
       sp = 1;
       return('?');
     } else
-      optarg = argv[optind++];
+      optarg = argv[unix_smail_optind++];
     sp = 1;
   } else {
-    if(argv[optind][++sp] == '\0') {
+    if(argv[unix_smail_optind][++sp] == '\0') {
       sp = 1;
-      optind++;
+      unix_smail_optind++;
     }
     optarg = NULL;
   }
   return(c);
 }

test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-smail/main.c

 **    -n namelist list of full names for simple aliases
 */
 
 #include  <stdio.h>
 #include  <ctype.h>
 #include        <stdlib.h>
 #include  "defs.h"
 
-int getopt();
+int unix_smail_getopt();
 
 int exitstat = 0;   /* exit status, set by resolve, deliver */
 
 enum edebug debug     = NO; /* set by -d or -v option   */
 enum ehandle handle   = HANDLE; /* which mail we can handle, see defs.h */
 enum erouting routing = ROUTING;/* to route or not to route, see defs.h */
 
 char hostname[SMLBUF]   = "";  /* set by -h, defaults in defs.h   */
int main(int argc,char *argv[])
   char *p;
   int c;
   int  printaddr  = 0;    /* or set by -A     */
   int nargc;
   char **nargv, **alias();
 
   char *optstr = "cdvArRlLH:h:p:u:q:a:n:m:f:F:";
   extern char *optarg;
-  extern int optind;
+  extern int unix_smail_optind;
 
 /*
 **  see if we aren't invoked as rmail
 */
   if((p = rindex(argv[0], '/')) == NULL) {
     p = argv[0];
   } else {
     p++;
   }
 
   if(*p != 'r' ) {
     handle = ALL;
   }
 
 /*
 **  Process command line arguments
 */
-  while ((c = getopt(argc, argv, optstr)) != EOF) {
+  while ((c = unix_smail_getopt(argc, argv, optstr)) != EOF) {
     switch ( c ) {
     case 'd': debug      = YES;     break;
     case 'v': debug      = VERBOSE;   break; 
     case 'A': printaddr  = 1;     break; 
     case 'F': from_addr  = optarg;    break;
     case 'r': routing    = ALWAYS;    break;
     case 'R': routing    = REROUTE;   break;
     case 'l': handle     = JUSTUUCP;  break;
while ((c = unix_smail_getopt(argc, argv, optstr)) != EOF) {
     case 'q': if(isdigit(*optarg)) {
           queuecost = atoi(optarg);
         }
         break;
     default:
       error( EX_USAGE, "valid flags are %s\n", optstr);
     }
   }
-  if ( argc <= optind ) {
+  if ( argc <= unix_smail_optind ) {
     error( EX_USAGE, "usage: %s [flags] address...\n", "smail" );
   }
 
 /*
 **  Get our default hostname and hostdomain.
 */
   getmynames();
 
 /*
 **  Spool the letter in a temporary file.
 */
-  nargc = argc - optind;
+  nargc = argc - unix_smail_optind;
   if(printaddr == 0) {
-    spool(nargc, &argv[optind]);
+    spool(nargc, &argv[unix_smail_optind]);
   }
 
 /*
 ** Do aliasing and fullname resolution
 */
-  nargv = alias(&nargc, &argv[optind]);
+  nargv = alias(&nargc, &argv[unix_smail_optind]);
 
 /*
 **  Map argv addresses to <host, user, form, cost>.
 */
   map(nargc, nargv, hostv, userv, formv, costv);
 /*
 **  If all we want it mapped addresses, print them and exit.
 */