From 29be58b3facc2b8fb4b35ae085eb692857238522 Mon Sep 17 00:00:00 2001
From: Tom Davis <tom@greyshirt.net>
Date: Sat, 28 Sep 2019 11:42:45 -0400
Subject: [PATCH] Don't clobber NOGLOB in functions

---
 README.md | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index fe3ec73..2f7153e 100644
--- a/README.md
+++ b/README.md
@@ -178,8 +178,12 @@ without leading/trailing white-space and with truncated spaces.
 trim_all() {
     # Usage: trim_all "   example   string    "
 
-    # Disable globbing to make the word-splitting below safe.
-    set -f
+    # Save and disable the globbing state to make the word-splitting
+    # below safe.
+    case $- in
+        *f*) DIDGLOB=false;         ;;
+        *)   DIDGLOB=true;  set -f; ;;
+    esac
 
     # Set the argument list to the word-splitted string.
     # This removes all leading/trailing white-space and reduces
@@ -189,8 +193,8 @@ trim_all() {
     # Print the argument list as a string.
     printf '%s\n' "$*"
 
-    # Re-enable globbing.
-    set +f
+    # Re-set globbing to it's previous condition
+    $DIDGLOB && set +f
 }
 ```
 
@@ -273,9 +277,12 @@ This is an alternative to `cut`, `awk` and other tools.
 
 ```sh
 split() {
-    # Disable globbing.
-    # This ensures that the word-splitting is safe.
-    set -f
+    # Save and disable the globbing state to make the word-splitting
+    # below safe.
+    case $- in
+        *f*) DIDGLOB=false;         ;;
+        *)   DIDGLOB=true;  set -f; ;;
+    esac
 
     # Store the current value of 'IFS' so we
     # can restore it later.
@@ -299,9 +306,8 @@ split() {
     # Restore the value of 'IFS'.
     IFS=$old_ifs
 
-    # Re-enable globbing.
-    set +f
-}
+    # Re-set globbing to it's previous condition
+    $DIDGLOB && set +f
 ```
 
 **Example Usage:**
@@ -329,9 +335,12 @@ $ split "1, 2, 3, 4, 5" ", "
 trim_quotes() {
     # Usage: trim_quotes "string"
 
-    # Disable globbing.
-    # This makes the word-splitting below safe.
-    set -f
+    # Save and disable the globbing state to make the word-splitting
+    # below safe.
+    case $- in
+        *f*) DIDGLOB=false;         ;;
+        *)   DIDGLOB=true;  set -f; ;;
+    esac
 
     # Store the current value of 'IFS' so we
     # can restore it later.
@@ -358,8 +367,8 @@ trim_quotes() {
     # Restore the value of 'IFS'.
     IFS=$old_ifs
 
-    # Re-enable globbing.
-    set +f
+    # Re-set globbing to it's previous condition
+    $DIDGLOB && set +f
 }
 ```