Attachment 312431 Details for Bug 456089 – Add /usr/bin/cpp to cpp search path

Add /usr/bin/cpp to cpp search path

glibc-20080716T0944-rpccpp.patch (text/plain), 1.78 KB, created by Lubomir Rintel on 2008-07-23 07:35:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubomir Rintel

Created: 2008-07-23 07:35:57 UTC

Size: 1.78 KB

patch

obsolete

>Add FHS complient location (/usr/bin/cpp) to rpcgen cpp search path.
>
>Lubomir Rintel <lkundrak@v3.sk>
>
>diff -urp glibc-20080716T0944.orig/sunrpc/rpc_main.c glibc-20080716T0944/sunrpc/rpc_main.c
>--- glibc-20080716T0944.orig/sunrpc/rpc_main.c	2006-11-10 21:54:46.000000000 +0100
>+++ glibc-20080716T0944/sunrpc/rpc_main.c	2008-07-21 19:53:20.000000000 +0200
>@@ -74,12 +74,13 @@ struct commandline
> 
> static const char *cmdname;
> 
>-#define SVR4_CPP "/usr/ccs/lib/cpp"
>-#define SUNOS_CPP "/lib/cpp"
>+static const char *CPPS[] = {
>+  "/usr/bin/cpp", "/lib/cpp", "/usr/ccs/lib/cpp", NULL
>+};
> 
> static const char *svcclosetime = "120";
> static int cppDefined;	/* explicit path for C preprocessor */
>-static const char *CPP = SUNOS_CPP;
>+static const char *CPP = NULL;
> static const char CPPFLAGS[] = "-C";
> static char *pathbuf;
> static int cpp_pid;
>@@ -332,24 +332,27 @@ static void
> find_cpp (void)
> {
>   struct stat buf;
>+  char **C;
> 
>-  if (stat (CPP, &buf) < 0)
>-    {				/* /lib/cpp or explicit cpp does not exist */
>-      if (cppDefined)
>-	{
>-	  fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP);
>-	  crash ();
>-	}
>-      else
>-	{			/* try the other one */
>-	  CPP = SVR4_CPP;
>-	  if (stat (CPP, &buf) < 0)
>-	    {			/* can't find any cpp */
>-	      fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout);
>-	      crash ();
>-	    }
>-	}
>+  /* explicitly defined cpp */
>+  if (CPP != NULL) {
>+    if (stat (CPP, &buf) < 0) 
>+      {
>+	fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP);
>+	crash ();
>+      } else {
>+        return;
>+      }
>+  }
>+
>+  /* look for cpp in default locations */
>+  for (C = (char **)CPPS; (CPP = *C) != NULL; C++)
>+    {
>+      if (stat (CPP, &buf) >= 0) 
>+        return;
>     }
>+  fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout);
>+  crash ();
> }
> 
> /*

Actions: View

Attachments on bug 456089: 312431