瀏覽代碼

Use a bit safer name for data source

... against conflict when -v is used and the name is exactly this.
Alois Mahdal 10 年之前
父節點
當前提交
82d4661554
共有 1 個檔案被更改,包括 9 行新增9 行删除
  1. 9
    9
      src/include/pretty.sh

+ 9
- 9
src/include/pretty.sh 查看文件

230
     test "$frontend" == "main" && frontend=$(basename $0)
230
     test "$frontend" == "main" && frontend=$(basename $0)
231
     test "$caller" == "main" && caller=$(basename $0)
231
     test "$caller" == "main" && caller=$(basename $0)
232
     test "$frontend" == "usage" && frontend=usage_is
232
     test "$frontend" == "usage" && frontend=usage_is
233
-    local src       # which source, or "producer" (__echo_*()) to use
233
+    local provider       # which provider (__echo_*()) to use
234
     while true; do case $1 in
234
     while true; do case $1 in
235
-        -c|--cmd)   src=cmd;   shift; break ;;
236
-        -f|--files) src=files; shift; break ;;
237
-        -l|--lines) src=lines; shift; break ;;
238
-        -t|--trace) src=trace; shift; break ;;
239
-        -u|--usage) src=usage; shift; break ;;
240
-        -v|--vars)  src=vars;  shift; break ;;
241
-        *)          src=args;         break ;;
235
+        -c|--cmd)   provider=cmd;   shift; break ;;
236
+        -f|--files) provider=files; shift; break ;;
237
+        -l|--lines) provider=lines; shift; break ;;
238
+        -t|--trace) provider=trace; shift; break ;;
239
+        -u|--usage) provider=usage; shift; break ;;
240
+        -v|--vars)  provider=vars;  shift; break ;;
241
+        *)          provider=args;         break ;;
242
     esac done
242
     esac done
243
     case $frontend in
243
     case $frontend in
244
         debug)    ;&
244
         debug)    ;&
246
         think)    ;&
246
         think)    ;&
247
         usage_is) ;&
247
         usage_is) ;&
248
         warn)
248
         warn)
249
-            __echo_$src "$@" | _pretty_$frontend >&2
249
+            __echo_$provider "$@" | _pretty_$frontend >&2
250
             ;;
250
             ;;
251
         *)
251
         *)
252
             echo "do not call __echo* directly: $frontend" >&2
252
             echo "do not call __echo* directly: $frontend" >&2