PATCH: P glob qual appends words when negated

PATCH: P glob qual appends words when negated

[Mikael Magnusson]

This is less often useful than prepending, but mplayer has backwards option parsing, possibly other programs do too. A is already taken and I'm not sure if this is worth a separate letter. Does anyone object to the relative grossness of using negation for this? I'll pop in some docs before committing if there's no complaints.

---
 Src/glob.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/Src/glob.c b/Src/glob.c
index 99499ca..bf758d4 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -178,7 +178,7 @@ struct globdata {
     int gd_gf_numsort;
     int gd_gf_follow, gd_gf_sorts, gd_gf_nsorts;
     struct globsort gd_gf_sortlist[MAX_SORTS];
-    LinkList gd_gf_pre_words;
+    LinkList gd_gf_pre_words, gd_gf_post_words;
 
     char *gd_glob_pre, *gd_glob_suf;
 };
@@ -210,6 +210,7 @@ static struct globdata curglobdata;
 #define gf_nsorts     (curglobdata.gd_gf_nsorts)
 #define gf_sortlist   (curglobdata.gd_gf_sortlist)
 #define gf_pre_words  (curglobdata.gd_gf_pre_words)
+#define gf_post_words (curglobdata.gd_gf_post_words)
 
 /* and macros for save/restore */
 
@@ -1074,7 +1075,14 @@ insert_glob_match(LinkList list, LinkNode next, char *data)
 	}
     }
 
-    insertlinknode(list, next, data);
+    next = insertlinknode(list, next, data);
+
+    if (gf_post_words) {
+	LinkNode added;
+	for (added = firstnode(gf_post_words); added; incnode(added)) {
+	    next = insertlinknode(list, next, dupstring(getdata(added)));
+	}
+    }
 }
 
 /*
@@ -1190,7 +1198,7 @@ zglob(LinkList list, LinkNode np, int nountok)
     gf_noglobdots = unset(GLOBDOTS);
     gf_numsort = isset(NUMERICGLOBSORT);
     gf_sorts = gf_nsorts = 0;
-    gf_pre_words = NULL;
+    gf_pre_words = gf_post_words = NULL;
 
     /* Check for qualifiers */
     while (!nobareglob ||
@@ -1679,9 +1687,10 @@ zglob(LinkList list, LinkNode np, int nountok)
 
 		    if (tt != NULL)
 		    {
-			if (!gf_pre_words)
-			    gf_pre_words = newlinklist();
-			addlinknode(gf_pre_words, tt);
+			LinkList *words = sense & 1 ? &gf_post_words : &gf_pre_words;
+			if (!*words)
+			    *words = newlinklist();
+			addlinknode(*words, tt);
 		    }
 		    break;
 		}
-- 
1.9.0

Re: PATCH: P glob qual appends words when negated

[Bart Schaefer]

On Sep 10,  7:24pm, Mikael Magnusson wrote:
} Subject: PATCH: P glob qual appends words when negated
}
} This is less often useful than prepending, but mplayer has backwards
} option parsing, possibly other programs do too. A is already taken and
} I'm not sure if this is worth a separate letter. Does anyone object to
} the relative grossness of using negation for this?

Hrm.  I do have one misgiving about this ... which is that negation,
once on, applies to all flags that follow until it is turned off.

However, I note that the o and O flags use negation in a simailar
way (though the fact that there are two makes that less interesting).

So this is probably OK.