From b8f65a8ba6a1ed5e5ffac03994d61c538275b722 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Wed, 19 Apr 2017 16:18:08 +0300 Subject: [PATCH] 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 --- tools/obexctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/obexctl.c b/tools/obexctl.c index 86c81d571..46943d682 100644 --- 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); -- 2.47.3