From 7a0bc7740d665cf8ea3442960fde67d28dda4ecf Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Fri, 5 Sep 2014 10:34:24 +0200
Subject: [PATCH 2/8] procfs: do not hard-code the default argument values

* procfs/main.c (common_options): If possible, do not hard-code the
default values.
---
 procfs/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/procfs/main.c b/procfs/main.c
index f3067d9..36a2d25 100644
--- a/procfs/main.c
+++ b/procfs/main.c
@@ -142,13 +142,13 @@ struct argp_option common_options[] = {
 #define XSTR(X)	#X
   { "clk-tck", 'h', "HZ", 0,
       "Unit used for the values expressed in system clock ticks "
-      "(default: sysconf(_SC_CLK_TCK))" },
+      "(default: " STR (OPT_CLK_TCK) ")" },
   { "stat-mode", 's', "MODE", 0,
       "The [pid]/stat file publishes information which on Hurd is only "
       "available to the process owner.  "
       "You can use this option to override its mode to be more permissive "
       "for compatibility purposes.  "
-      "(default: 0400)" },
+      "(default: " STR (OPT_STAT_MODE) ")" },
   { "fake-self", 'S', "PID", OPTION_ARG_OPTIONAL,
       "Provide a fake \"self\" symlink to the given PID, for compatibility "
       "purposes.  If PID is omitted, \"self\" will point to init.  "
@@ -164,7 +164,7 @@ struct argp_option common_options[] = {
       "Make USER the owner of files related to processes without one.  "
       "Be aware that USER will be granted access to the environment and "
       "other sensitive information about the processes in question.  "
-      "(default: use uid 0)" },
+      "(default: use uid " STR (OPT_ANON_OWNER) ")" },
   { "nodev", NODEV_KEY, NULL, 0,
       "Ignored for compatibility with Linux' procfs." },
   { "noexec", NOEXEC_KEY, NULL, 0,
-- 
2.1.0