[gentoo-commits] gentoo-projects commit in portage-utils: main.c

["Fabian Groffen (grobian)" <grobian@gentoo.org>]

grobian     08/09/13 18:58:28

  Modified:             main.c
  Log:
  strnlen is a GNU extension, use strlen instead.

Revision  Changes    Path
1.156                portage-utils/main.c

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/main.c?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/main.c?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/main.c?r1=1.155&r2=1.156

Index: main.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- main.c	11 May 2008 17:25:00 -0000	1.155
+++ main.c	13 Sep 2008 18:58:28 -0000	1.156
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2008 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.155 2008/05/11 17:25:00 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.156 2008/09/13 18:58:28 grobian Exp $
  *
  * Copyright 2005-2008 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2008 Mike Frysinger  - <vapier@gentoo.org>
@@ -482,14 +482,14 @@
 			strncat(portroot, "/", sizeof(portroot));
 
 	f = 0;
-	profilelen = readlink("/etc/make.profile", profile, sizeof(profile));
+	profilelen = readlink("/etc/make.profile", profile, sizeof(profile) - 1);
 	if (profilelen == -1)
 		strcpy(profile, "/etc/make.profile");
 	else
 		profile[profilelen]='\0';
 
 	if (profile[0] != '/') {
-		memmove(profile+5, profile, strnlen(profile, (size_t)profilelen)+1);
+		memmove(profile+5, profile, strlen(profile)+1);
 		memcpy(profile, "/etc/", 5);
 	}
 	do {