tools/obexctl: Fix not being able to PullAll

The change to use wordexp breaks PullAll since '*' seems to be expanded
to something else, the manpage in fact mention the $* is expansion is
undefined:

[40:88:05:14:3A:7A]# cp * /tmp/all.vcf
Attempting to Pull
[NEW] Transfer /org/bluez/obex/client/session7/transfer29
Pull successful
[CHG] Transfer /org/bluez/obex/client/session7/transfer29 Status: error
[DEL] Transfer /org/bluez/obex/client/session7/transfer29
[40:88:05:14:3A:7A]# cp *.vcf /tmp/all.vcf
Attempting to PullAll
[NEW] Transfer /org/bluez/obex/client/session7/transfer30
PullAll successful
[CHG] Transfer /org/bluez/obex/client/session7/transfer30 Status: active
[CHG] Transfer /org/bluez/obex/client/session7/transfer30 Transferred: 4085 (@4KB/s)
[CHG] Transfer /org/bluez/obex/client/session7/transfer30 Transferred: 8170 (@4KB/s)
[CHG] Transfer /org/bluez/obex/client/session7/transfer30 Transferred: 12255 (@4KB/s)
[CHG] Transfer /org/bluez/obex/client/session7/transfer30 Transferred: 20425 (@8KB/s)
[CHG] Transfer /org/bluez/obex/client/session7/transfer30 Transferred: 24510 (@4KB/s)
[CHG] Transfer /org/bluez/obex/client/session7/transfer30 Status: complete
[DEL] Transfer /org/bluez/obex/client/session7/transfer30

diff --git a/tools/obexctl.c b/tools/obexctl.c
index 86c81d5..46943d6 100644 (file)
--- a/tools/obexctl.c
+++ b/tools/obexctl.c
@@ -1710,7 +1710,7 @@ static void pbap_cp(GDBusProxy *proxy, int argc, char *argv[])
                return;
        }
 
-       if (strcmp(argv[1], "*") == 0)
+       if (strcmp(argv[1], "*") == 0 || strcmp(argv[1], "*.vcf") == 0)
                return pbap_pull_all(proxy, argc, argv);
 
        return pbap_pull(proxy, argc, argv);