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

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

[Ned Ludd (solar)]

solar       07/11/24 08:53:35

  Modified:             main.c qglsa.c quse.c
  Log:
  - if TERM=dumb disable color

Revision  Changes    Path
1.150                portage-utils/main.c

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

Index: main.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- main.c	24 Nov 2007 08:11:49 -0000	1.149
+++ main.c	24 Nov 2007 08:53:35 -0000	1.150
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.149 2007/11/24 08:11:49 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.150 2007/11/24 08:53:35 solar Exp $
  *
  * Copyright 2005-2007 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2007 Mike Frysinger  - <vapier@gentoo.org>
@@ -249,7 +249,6 @@
 	return str;
 }
 
-
 static char *pkg_name(const char *const_name);
 static char *pkg_name(const char *const_name) {
 	static char name[_POSIX_PATH_MAX];
@@ -497,7 +496,7 @@
 				rmspace(buf);
 				if (*buf == '#' || *buf == '\0')
 					continue;
-				for (i=0; i<ARR_SIZE(vars_to_read); ++i) {
+				for (i=0; i < ARR_SIZE(vars_to_read); ++i) {
 					if (buf[vars_to_read[i].name_len] != '=' && buf[vars_to_read[i].name_len] != ' ')
 						continue;
 					if (strncmp(buf, vars_to_read[i].name, vars_to_read[i].name_len))
@@ -546,7 +545,7 @@
 	} while (1);
 
 	/* finally, check the env */
-	for (i=0; i<ARR_SIZE(vars_to_read); ++i) {
+	for (i=0; i < ARR_SIZE(vars_to_read); ++i) {
 		s = getenv(vars_to_read[i].name);
 		if (s != NULL) {
 			switch (vars_to_read[i].type) {
@@ -1034,7 +1033,7 @@
 			if ((S_ISFIFO(st.st_mode)) == 0)
 				no_colors();
 #endif
-	if (getenv("TERM") == NULL)
+	if ((getenv("TERM") == NULL) || ((strcmp(getenv("TERM"), "dumb")) == 0))
 		no_colors();
 
 	initialize_portage_env();



1.10                 portage-utils/qglsa.c

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

Index: qglsa.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qglsa.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qglsa.c	24 May 2007 14:47:18 -0000	1.9
+++ qglsa.c	24 Nov 2007 08:53:35 -0000	1.10
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qglsa.c,v 1.9 2007/05/24 14:47:18 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qglsa.c,v 1.10 2007/11/24 08:53:35 solar Exp $
  *
  * Copyright 2005-2007 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2007 Mike Frysinger  - <vapier@gentoo.org>
@@ -30,7 +30,7 @@
 	"Mark specified GLSAs as fixed",
 	COMMON_OPTS_HELP
 };
-static const char qglsa_rcsid[] = "$Id: qglsa.c,v 1.9 2007/05/24 14:47:18 solar Exp $";
+static const char qglsa_rcsid[] = "$Id: qglsa.c,v 1.10 2007/11/24 08:53:35 solar Exp $";
 #define qglsa_usage(ret) usage(ret, QGLSA_FLAGS, qglsa_long_opts, qglsa_opts_help, lookup_applet_idx("qglsa"))
 
 static char *qglsa_load_list(void);
@@ -73,7 +73,7 @@
 	if (strchr(xml_buf, '&') == NULL)
 		return;
 
-	for (i=0; i<ARRAY_SIZE(encoded); ++i) {
+	for (i=0; i < ARRAY_SIZE(encoded); ++i) {
 		/* for now, we assume that strlen(decoded) is always 1 ... if
 		 * this changes, we have to update the 'p++' accordingly */
 		while ((p=strstr(xml_buf, encoded[i])) != NULL) {



1.59                 portage-utils/quse.c

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

Index: quse.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/quse.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- quse.c	24 May 2007 14:47:18 -0000	1.58
+++ quse.c	24 Nov 2007 08:53:35 -0000	1.59
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/quse.c,v 1.58 2007/05/24 14:47:18 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/quse.c,v 1.59 2007/11/24 08:53:35 solar Exp $
  *
  * Copyright 2005-2007 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2007 Mike Frysinger  - <vapier@gentoo.org>
@@ -35,7 +35,7 @@
 	"Only show package name",
 	COMMON_OPTS_HELP
 };
-static const char quse_rcsid[] = "$Id: quse.c,v 1.58 2007/05/24 14:47:18 solar Exp $";
+static const char quse_rcsid[] = "$Id: quse.c,v 1.59 2007/11/24 08:53:35 solar Exp $";
 #define quse_usage(ret) usage(ret, QUSE_FLAGS, quse_long_opts, quse_opts_help, lookup_applet_idx("quse"))
 
 int quse_describe_flag(int ind, int argc, char **argv);
@@ -156,7 +156,7 @@
 		}
 	}
 
-	for (f=0; f<NUM_SEARCH_FILES; ++f)
+	for (f=0; f < NUM_SEARCH_FILES; ++f)
 		if (fp[f] != NULL)
 			fclose(fp[f]);
 



-- 
gentoo-commits@gentoo.org mailing list