[Pkg-shadow-commits] r2285 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-08-22 02:33:08 +0000 (Fri, 22 Aug 2008)
New Revision: 2285

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/grpconv.c
   upstream/trunk/src/grpunconv.c
Log:
	* src/grpconv.c: Use Basename for the definition of Prog. Prog
	needs a file visibility.
	* src/grpunconv.c: Likewise.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-08-22 02:31:55 UTC (rev 2284)
+++ upstream/trunk/ChangeLog	2008-08-22 02:33:08 UTC (rev 2285)
@@ -1,3 +1,9 @@
+2008-08-21  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* src/grpconv.c: Use Basename for the definition of Prog. Prog
+	needs a file visibility.
+	* src/grpunconv.c: Likewise.
+
 2008-08-20  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* src/chfn.c: Do not exit on pw_unlock failures.

Modified: upstream/trunk/src/grpconv.c
===================================================================
--- upstream/trunk/src/grpconv.c	2008-08-22 02:31:55 UTC (rev 2284)
+++ upstream/trunk/src/grpconv.c	2008-08-22 02:33:08 UTC (rev 2285)
@@ -53,8 +53,9 @@
 /*
  * Global variables
  */
-static bool gr_locked   = false;
+static bool gr_locked  = false;
 static bool sgr_locked = false;
+static char *Prog;
 
 /* local function prototypes */
 static void fail_exit (int);
@@ -86,8 +87,9 @@
 	struct group grent;
 	const struct sgrp *sg;
 	struct sgrp sgent;
-	char *Prog = argv[0];
 
+	Prog = Basename (argv[0]);
+
 	(void) setlocale (LC_ALL, "");
 	(void) bindtextdomain (PACKAGE, LOCALEDIR);
 	(void) textdomain (PACKAGE);

Modified: upstream/trunk/src/grpunconv.c
===================================================================
--- upstream/trunk/src/grpunconv.c	2008-08-22 02:31:55 UTC (rev 2284)
+++ upstream/trunk/src/grpunconv.c	2008-08-22 02:33:08 UTC (rev 2285)
@@ -54,8 +54,9 @@
 /*
  * Global variables
  */
-static bool gr_locked   = false;
+static bool gr_locked  = false;
 static bool sgr_locked = false;
+static char *Prog;
 
 /* local function prototypes */
 static void fail_exit (int status);
@@ -86,8 +87,9 @@
 	const struct group *gr;
 	struct group grent;
 	const struct sgrp *sg;
-	char *Prog = argv[0];
 
+	Prog = Basename (argv[0]);
+
 	(void) setlocale (LC_ALL, "");
 	(void) bindtextdomain (PACKAGE, LOCALEDIR);
 	(void) textdomain (PACKAGE);