diff options
| -rw-r--r-- | main.c | 9 | ||||
| -rw-r--r-- | qglsa.c | 6 | ||||
| -rw-r--r-- | quse.c | 6 |
3 files changed, 10 insertions, 11 deletions
@@ -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 @@ static char *remove_extra_space(char *str) 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 @@ void initialize_portage_env(void) 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 @@ void initialize_portage_env(void) } 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 @@ int main(int argc, char **argv) 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,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 @@ static const char *qglsa_opts_help[] = { "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 @@ static void qglsa_decode_entities(char *xml_buf, size_t len) 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,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 @@ static const char *quse_opts_help[] = { "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 @@ skip_file: } } - for (f=0; f<NUM_SEARCH_FILES; ++f) + for (f=0; f < NUM_SEARCH_FILES; ++f) if (fp[f] != NULL) fclose(fp[f]); |