From 84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Tue, 11 Aug 2009 15:59:56 +0200
Subject: generator.ml: use new "Pathname" designation

Nearly every file-related function in daemons/*.c is affected:
Remove this pair of statements from each affected do_* function:
-  NEED_ROOT (return -1);
-  ABS_PATH (dir, return -1);
and change the type of the corresponding parameter to "const char *".
* src/generator.ml: Emit NEED_ROOT just once, even when there are two or
more Pathname args.
---
 daemon/grep.c | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'daemon/grep.c')

diff --git a/daemon/grep.c b/daemon/grep.c
index f0dbefd1..d1f5a3f7 100644
--- a/daemon/grep.c
+++ b/daemon/grep.c
@@ -28,16 +28,13 @@
 #include "actions.h"
 
 static char **
-grep (const char *prog, const char *flag, char *regex, char *path)
+grep (const char *prog, const char *flag, const char *regex, const char *path)
 {
   char *buf;
   char *out, *err;
   int r;
   char **lines;
 
-  NEED_ROOT (return NULL);
-  ABS_PATH (path, return NULL);
-
   /* Make the path relative to /sysroot. */
   buf = sysroot_path (path);
   if (!buf) {
@@ -67,74 +64,74 @@ grep (const char *prog, const char *flag, char *regex, char *path)
 }
 
 char **
-do_grep (char *regex, char *path)
+do_grep (const char *regex, const char *path)
 {
   /* The "--" is not really needed, but it helps when we don't need a flag. */
   return grep ("grep", "--", regex, path);
 }
 
 char **
-do_egrep (char *regex, char *path)
+do_egrep (const char *regex, const char *path)
 {
   return grep ("egrep", "--", regex, path);
 }
 
 char **
-do_fgrep (char *regex, char *path)
+do_fgrep (const char *regex, const char *path)
 {
   return grep ("fgrep", "--", regex, path);
 }
 
 char **
-do_grepi (char *regex, char *path)
+do_grepi (const char *regex, const char *path)
 {
   return grep ("grep", "-i", regex, path);
 }
 
 char **
-do_egrepi (char *regex, char *path)
+do_egrepi (const char *regex, const char *path)
 {
   return grep ("egrep", "-i", regex, path);
 }
 
 char **
-do_fgrepi (char *regex, char *path)
+do_fgrepi (const char *regex, const char *path)
 {
   return grep ("fgrep", "-i", regex, path);
 }
 
 char **
-do_zgrep (char *regex, char *path)
+do_zgrep (const char *regex, const char *path)
 {
   return grep ("zgrep", "--", regex, path);
 }
 
 char **
-do_zegrep (char *regex, char *path)
+do_zegrep (const char *regex, const char *path)
 {
   return grep ("zegrep", "--", regex, path);
 }
 
 char **
-do_zfgrep (char *regex, char *path)
+do_zfgrep (const char *regex, const char *path)
 {
   return grep ("zfgrep", "--", regex, path);
 }
 
 char **
-do_zgrepi (char *regex, char *path)
+do_zgrepi (const char *regex, const char *path)
 {
   return grep ("zgrep", "-i", regex, path);
 }
 
 char **
-do_zegrepi (char *regex, char *path)
+do_zegrepi (const char *regex, const char *path)
 {
   return grep ("zegrep", "-i", regex, path);
 }
 
 char **
-do_zfgrepi (char *regex, char *path)
+do_zfgrepi (const char *regex, const char *path)
 {
   return grep ("zfgrep", "-i", regex, path);
 }
-- 
cgit