aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2006-01-12 15:05:53 +0000
committerNed Ludd <solar@gentoo.org>2006-01-12 15:05:53 +0000
commit1e76da0f7471686b8587babb7d6b358429e9b694 (patch)
tree3f26c697fa834c1ba9b34e90c3c471d6098fcd79
parenttest suite for atom_compare (diff)
downloadportage-utils-1e76da0f7471686b8587babb7d6b358429e9b694.tar.gz
portage-utils-1e76da0f7471686b8587babb7d6b358429e9b694.tar.bz2
portage-utils-1e76da0f7471686b8587babb7d6b358429e9b694.zip
- regen manpages, update depends, get rid of any compile warns and get ready to release a new portage-utilsv0.1.12
-rw-r--r--.depend7
-rw-r--r--Makefile4
-rw-r--r--main.c64
-rw-r--r--man/q.16
-rw-r--r--man/qatom.111
-rw-r--r--man/qcheck.16
-rw-r--r--man/qdepends.16
-rw-r--r--man/qfile.16
-rw-r--r--man/qgrep.18
-rw-r--r--man/qlist.16
-rw-r--r--man/qlop.16
-rw-r--r--man/qmerge.16
-rw-r--r--man/qpkg.16
-rw-r--r--man/qsearch.16
-rw-r--r--man/qsize.16
-rw-r--r--man/qtbz2.16
-rw-r--r--man/quse.16
-rw-r--r--man/qxpak.16
-rw-r--r--qmerge.c6
19 files changed, 60 insertions, 118 deletions
diff --git a/.depend b/.depend
index d20d117..cc32ae7 100644
--- a/.depend
+++ b/.depend
@@ -1,6 +1,7 @@
main.o: main.c libq/libq.c libq/busybox.h libq/libq.h libq/colors.c \
libq/xmalloc.c libq/xstrdup.c libq/xasprintf.c libq/hash_fd.c \
libq/md5_sha1_sum.c libq/human_readable.c libq/rmspace.c \
- libq/atom_explode.c libq/vdb_get_next_dir.c libq/virtuals.c applets.h \
- q.c qcheck.c qdepends.c qfile.c qlist.c qlop.c qsearch.c qsize.c \
- qmerge.c qtbz2.c quse.c qxpak.c qpkg.c qgrep.c qatom.c
+ libq/atom_explode.c libq/atom_compare.c libq/vdb_get_next_dir.c \
+ libq/virtuals.c applets.h q.c qcheck.c qdepends.c qfile.c qlist.c \
+ qlop.c qsearch.c qsize.c qmerge.c qtbz2.c quse.c qxpak.c qpkg.c qgrep.c \
+ qatom.c
diff --git a/Makefile b/Makefile
index 6f61800..9495e89 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# Copyright 2005-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-projects/portage-utils/Makefile,v 1.37 2006/01/07 23:18:07 solar Exp $
+# $Header: /var/cvsroot/gentoo-projects/portage-utils/Makefile,v 1.38 2006/01/12 15:05:53 solar Exp $
####################################################################
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -47,7 +47,7 @@ endif
#####################################################
APPLETS = q qatom qcheck qdepends qfile qgrep qlist qlop qpkg qsearch qsize qtbz2 quse qxpak
-APPLETS += qmerge
+#APPLETS += qmerge
SRC = $(APPLETS:%=%.c) main.c
MPAGES = man/q.1
HFLAGS += $(shell for x in $(APPLETS) ; do echo -n "-DAPPLET_$$x "; done)
diff --git a/main.c b/main.c
index 9dc2f5b..5e3841a 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
/*
* Copyright 2005-2006 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.94 2006/01/08 07:15:49 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.95 2006/01/12 15:05:53 solar Exp $
*
* Copyright 2005-2006 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2006 Mike Frysinger - <vapier@gentoo.org>
@@ -893,68 +893,6 @@ depend_atom **get_vdb_atoms(void) {
#include "qgrep.c"
#include "qatom.c"
-#if 0
-queue *resolve_vdb_virtuals();
-queue *resolve_vdb_virtuals() {
- DIR *dir, *dirp;
- struct dirent *dentry_cat, *dentry_pkg;
- char buf[BUFSIZE];
- depend_atom *atom;
-
- chdir("/");
-
- /* now try to run through vdb and locate matches for user inputs */
- if ((dir = opendir(portvdb)) == NULL)
- return virtuals;
-
- /* scan all the categories */
- while ((dentry_cat = q_vdb_get_next_dir(dir)) != NULL) {
- snprintf(buf, sizeof(buf), "%s/%s", portvdb, dentry_cat->d_name);
- if ((dirp = opendir(buf)) == NULL)
- continue;
-
- /* scan all the packages in this category */
- while ((dentry_pkg = q_vdb_get_next_dir(dirp)) != NULL) {
- FILE *fp;
- char *p;
- /* see if user wants any of these packages */
- snprintf(buf, sizeof(buf), "%s/%s/%s/PROVIDE", portvdb, dentry_cat->d_name, dentry_pkg->d_name);
- if ((fp = fopen(buf, "r")) != NULL) {
- fgets(buf, sizeof(buf), fp);
-
- if ((p = strrchr(buf, '\n')) != NULL)
- *p = 0;
-
- rmspace(buf);
-
- if (*buf) {
- int ok = 0;
- char *v, *tmp = xstrdup(buf);
- snprintf(buf, sizeof(buf), "%s/%s", dentry_cat->d_name, dentry_pkg->d_name);
-
- atom = atom_explode(buf);
- if (!atom) {
- warn("could not explode '%s'", buf);
- continue;
- }
- sprintf(buf, "%s/%s", atom->CATEGORY, atom->PN);
- if ((v = virtual(tmp, virtuals)) != NULL) {
- IF_DEBUG(fprintf(stderr, "%s provided by %s (removing)\n", tmp, v));
- virtuals = del_set(tmp, virtuals, &ok);
- }
- virtuals = add_set(tmp, buf, virtuals);
- IF_DEBUG(fprintf(stderr, "%s provided by %s/%s (adding)\n", tmp, atom->CATEGORY, dentry_pkg->d_name));
- free(tmp);
- atom_implode(atom);
- }
- fclose(fp);
- }
- }
- }
- return virtuals;
-}
-#endif
-
void cleanup() {
reinitialize_as_needed();
free_sets(virtuals);
diff --git a/man/q.1 b/man/q.1
index de7e56d..5fc04fe 100644
--- a/man/q.1
+++ b/man/q.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH q "1" "January 2006" "Gentoo Foundation" "q"
.SH NAME
-q \- manual page for q compiled on Jan 8 2006
+q \- manual page for q compiled on Jan 12 2006
.SH SYNOPSIS
.B q
\fI<applet> \fR[\fIarguments\fR]...
@@ -75,4 +75,4 @@ Options: \fB\-[irvqChV]\fR
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: q.1,v 1.11 2006/01/08 07:15:49 solar Exp $
+$Id: q.1,v 1.12 2006/01/12 15:05:53 solar Exp $
diff --git a/man/qatom.1 b/man/qatom.1
index afc2272..d995baa 100644
--- a/man/qatom.1
+++ b/man/qatom.1
@@ -1,12 +1,15 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH qatom "1" "January 2006" "Gentoo Foundation" "qatom"
.SH NAME
-qatom \- manual page for qatom compiled on Jan 8 2006
+qatom \- manual page for qatom compiled on Jan 12 2006
.SH SYNOPSIS
.B qatom
\fI<pkg> : split atom strings\fR
.SH DESCRIPTION
-Options: \fB\-[vqChV]\fR
+Options: \fB\-[cvqChV]\fR
+.TP
+\fB\-c\fR, \fB\-\-compare\fR
+* Compare two atoms
.TP
\fB\-v\fR, \fB\-\-verbose\fR
* Make a lot of noise
@@ -23,4 +26,4 @@ Options: \fB\-[vqChV]\fR
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: qatom.1,v 1.3 2006/01/08 07:15:49 solar Exp $
+$Id: qatom.1,v 1.4 2006/01/12 15:05:53 solar Exp $
diff --git a/man/qcheck.1 b/man/qcheck.1
index 92d8f1d..2d5bb79 100644
--- a/man/qcheck.1
+++ b/man/qcheck.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH qcheck "1" "January 2006" "Gentoo Foundation" "qcheck"
.SH NAME
-qcheck \- manual page for qcheck compiled on Jan 8 2006
+qcheck \- manual page for qcheck compiled on Jan 12 2006
.SH SYNOPSIS
.B qcheck
\fI<pkgname> : verify mtimes/digests\fR
@@ -26,4 +26,4 @@ Options: \fB\-[avqChV]\fR
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: qcheck.1,v 1.9 2006/01/08 07:15:49 solar Exp $
+$Id: qcheck.1,v 1.10 2006/01/12 15:05:53 solar Exp $
diff --git a/man/qdepends.1 b/man/qdepends.1
index 0c1086f..554a49d 100644
--- a/man/qdepends.1
+++ b/man/qdepends.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH qdepends "1" "January 2006" "Gentoo Foundation" "qdepends"
.SH NAME
-qdepends \- manual page for qdepends compiled on Jan 8 2006
+qdepends \- manual page for qdepends compiled on Jan 12 2006
.SH SYNOPSIS
.B qdepends
\fI<pkgname> : show dependency info\fR
@@ -48,4 +48,4 @@ Options: \fB\-[drpaNk\fR:Q:vqChV]
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: qdepends.1,v 1.10 2006/01/08 07:15:49 solar Exp $
+$Id: qdepends.1,v 1.11 2006/01/12 15:05:53 solar Exp $
diff --git a/man/qfile.1 b/man/qfile.1
index 8c10fe4..c60fbbc 100644
--- a/man/qfile.1
+++ b/man/qfile.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH qfile "1" "January 2006" "Gentoo Foundation" "qfile"
.SH NAME
-qfile \- manual page for qfile compiled on Jan 8 2006
+qfile \- manual page for qfile compiled on Jan 12 2006
.SH SYNOPSIS
.B qfile
\fI<filename> : list all pkgs owning files\fR
@@ -26,4 +26,4 @@ Options: \fB\-[evqChV]\fR
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: qfile.1,v 1.9 2006/01/08 07:15:49 solar Exp $
+$Id: qfile.1,v 1.10 2006/01/12 15:05:53 solar Exp $
diff --git a/man/qgrep.1 b/man/qgrep.1
index f24fbb4..58526c0 100644
--- a/man/qgrep.1
+++ b/man/qgrep.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH qgrep "1" "January 2006" "Gentoo Foundation" "qgrep"
.SH NAME
-qgrep \- manual page for qgrep compiled on Jan 8 2006
+qgrep \- manual page for qgrep compiled on Jan 12 2006
.SH SYNOPSIS
.B qgrep
\fI<misc args> : grep in ebuilds\fR
@@ -9,7 +9,7 @@ qgrep \- manual page for qgrep compiled on Jan 8 2006
Options: \fB\-[IiHcevqChV]\fR
.TP
\fB\-I\fR, \fB\-\-invert\-match\fR
-* Select non\-matching lines
+* Select non-matching lines
.TP
\fB\-i\fR, \fB\-\-ignore\-case\fR
* Ignore case distinctions
@@ -38,4 +38,4 @@ Options: \fB\-[IiHcevqChV]\fR
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: qgrep.1,v 1.5 2006/01/08 07:15:49 solar Exp $
+$Id: qgrep.1,v 1.6 2006/01/12 15:05:53 solar Exp $
diff --git a/man/qlist.1 b/man/qlist.1
index 362df21..e706c5f 100644
--- a/man/qlist.1
+++ b/man/qlist.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH qlist "1" "January 2006" "Gentoo Foundation" "qlist"
.SH NAME
-qlist \- manual page for qlist compiled on Jan 8 2006
+qlist \- manual page for qlist compiled on Jan 12 2006
.SH SYNOPSIS
.B qlist
\fI<pkgname> : list files owned by pkgname\fR
@@ -41,4 +41,4 @@ Options: \fB\-[IDedosvqChV]\fR
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: qlist.1,v 1.9 2006/01/08 07:15:49 solar Exp $
+$Id: qlist.1,v 1.10 2006/01/12 15:05:53 solar Exp $
diff --git a/man/qlop.1 b/man/qlop.1
index fc52162..cf65e73 100644
--- a/man/qlop.1
+++ b/man/qlop.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH qlop "1" "January 2006" "Gentoo Foundation" "qlop"
.SH NAME
-qlop \- manual page for qlop compiled on Jan 8 2006
+qlop \- manual page for qlop compiled on Jan 12 2006
.SH SYNOPSIS
.B qlop
\fI<pkgname> : emerge log analyzer\fR
@@ -49,4 +49,4 @@ Options: \fB\-[gtluscf\fR:F:HvqChV]
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: qlop.1,v 1.7 2006/01/08 07:15:49 solar Exp $
+$Id: qlop.1,v 1.8 2006/01/12 15:05:53 solar Exp $
diff --git a/man/qmerge.1 b/man/qmerge.1
index 2fb6c6f..86e3169 100644
--- a/man/qmerge.1
+++ b/man/qmerge.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH qmerge "1" "January 2006" "Gentoo Foundation" "qmerge"
.SH NAME
-qmerge \- manual page for qmerge compiled on Jan 8 2006
+qmerge \- manual page for qmerge compiled on Jan 12 2006
.SH SYNOPSIS
.B qmerge
\fI<pkgnames> : fetch and merge binary package\fR
@@ -38,4 +38,4 @@ Options: \fB\-[fsipyvqChV]\fR
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: qmerge.1,v 1.2 2006/01/08 07:15:49 solar Exp $
+$Id: qmerge.1,v 1.3 2006/01/12 15:05:53 solar Exp $
diff --git a/man/qpkg.1 b/man/qpkg.1
index 705b94b..09497ac 100644
--- a/man/qpkg.1
+++ b/man/qpkg.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH qpkg "1" "January 2006" "Gentoo Foundation" "qpkg"
.SH NAME
-qpkg \- manual page for qpkg compiled on Jan 8 2006
+qpkg \- manual page for qpkg compiled on Jan 12 2006
.SH SYNOPSIS
.B qpkg
\fI<misc args> : manipulate Gentoo binpkgs\fR
@@ -23,4 +23,4 @@ Options: \fB\-[vqChV]\fR
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: qpkg.1,v 1.6 2006/01/08 07:15:49 solar Exp $
+$Id: qpkg.1,v 1.7 2006/01/12 15:05:53 solar Exp $
diff --git a/man/qsearch.1 b/man/qsearch.1
index 612aac6..240a6d4 100644
--- a/man/qsearch.1
+++ b/man/qsearch.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH qsearch "1" "January 2006" "Gentoo Foundation" "qsearch"
.SH NAME
-qsearch \- manual page for qsearch compiled on Jan 8 2006
+qsearch \- manual page for qsearch compiled on Jan 12 2006
.SH SYNOPSIS
.B qsearch
\fI<regex> : search pkgname/desc\fR
@@ -43,4 +43,4 @@ Options: \fB\-[acsSNHvqChV]\fR
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: qsearch.1,v 1.9 2006/01/08 07:15:49 solar Exp $
+$Id: qsearch.1,v 1.10 2006/01/12 15:05:53 solar Exp $
diff --git a/man/qsize.1 b/man/qsize.1
index 563b8f6..e885df9 100644
--- a/man/qsize.1
+++ b/man/qsize.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH qsize "1" "January 2006" "Gentoo Foundation" "qsize"
.SH NAME
-qsize \- manual page for qsize compiled on Jan 8 2006
+qsize \- manual page for qsize compiled on Jan 12 2006
.SH SYNOPSIS
.B qsize
\fI<pkgname> : calculate size usage\fR
@@ -44,4 +44,4 @@ Options: \fB\-[fasSmkbvqChV]\fR
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: qsize.1,v 1.9 2006/01/08 07:15:49 solar Exp $
+$Id: qsize.1,v 1.10 2006/01/12 15:05:53 solar Exp $
diff --git a/man/qtbz2.1 b/man/qtbz2.1
index 494f9b0..c6201a1 100644
--- a/man/qtbz2.1
+++ b/man/qtbz2.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH qtbz2 "1" "January 2006" "Gentoo Foundation" "qtbz2"
.SH NAME
-qtbz2 \- manual page for qtbz2 compiled on Jan 8 2006
+qtbz2 \- manual page for qtbz2 compiled on Jan 12 2006
.SH SYNOPSIS
.B qtbz2
\fI<misc args> : manipulate tbz2 packages\fR
@@ -38,4 +38,4 @@ Options: \fB\-[jstxOvqChV]\fR
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: qtbz2.1,v 1.7 2006/01/08 07:15:49 solar Exp $
+$Id: qtbz2.1,v 1.8 2006/01/12 15:05:53 solar Exp $
diff --git a/man/quse.1 b/man/quse.1
index 0041342..990e7b9 100644
--- a/man/quse.1
+++ b/man/quse.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH quse "1" "January 2006" "Gentoo Foundation" "quse"
.SH NAME
-quse \- manual page for quse compiled on Jan 8 2006
+quse \- manual page for quse compiled on Jan 12 2006
.SH SYNOPSIS
.B quse
\fI<useflag> : find pkgs using useflags\fR
@@ -38,4 +38,4 @@ Options: \fB\-[eavKLDvqChV]\fR
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: quse.1,v 1.9 2006/01/08 07:15:49 solar Exp $
+$Id: quse.1,v 1.10 2006/01/12 15:05:53 solar Exp $
diff --git a/man/qxpak.1 b/man/qxpak.1
index 166eb2b..11913b3 100644
--- a/man/qxpak.1
+++ b/man/qxpak.1
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
.TH qxpak "1" "January 2006" "Gentoo Foundation" "qxpak"
.SH NAME
-qxpak \- manual page for qxpak compiled on Jan 8 2006
+qxpak \- manual page for qxpak compiled on Jan 12 2006
.SH SYNOPSIS
.B qxpak
\fI<misc args> : manipulate xpak archives\fR
@@ -40,4 +40,4 @@ Options: \fB\-[lxcd\fR:OvqChV]
\fB\-V\fR, \fB\-\-version\fR
* Print version and exit
.PP
-$Id: qxpak.1,v 1.7 2006/01/08 07:15:49 solar Exp $
+$Id: qxpak.1,v 1.8 2006/01/12 15:05:53 solar Exp $
diff --git a/qmerge.c b/qmerge.c
index 6902536..197ca8d 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1,7 +1,7 @@
/*
* Copyright 2005-2006 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.12 2006/01/09 13:31:41 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.13 2006/01/12 15:05:53 solar Exp $
*
* Copyright 2005-2006 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2006 Mike Frysinger - <vapier@gentoo.org>
@@ -27,7 +27,7 @@ static const char *qmerge_opts_help[] = {
COMMON_OPTS_HELP
};
-static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.12 2006/01/09 13:31:41 solar Exp $";
+static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.13 2006/01/12 15:05:53 solar Exp $";
#define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge"))
char pretend = 0;
@@ -621,6 +621,6 @@ int qmerge_main(int argc, char **argv) {
#else /* ! APPLET_qmerge */
int qmerge_main(int argc, char **argv) {
- errf("%s", err_noapplet);
+ errf("%s%s%s", err_noapplet, DKGREEN, NORM);
}
#endif /* APPLET_qmerge */