summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-01-05 13:42:25 -0800
committerMike Lockwood <lockwood@android.com>2010-02-15 11:58:56 -0500
commit8071a4bdb6e437baa4efcb8cf777d4caeaf069e4 (patch)
tree10620901df752b7629c461e0e5ac68b4c47d3307 /adb
parent91a54c11cbfbe3adc1df2f523c75ad76affb0ae9 (diff)
downloadsystem_core-8071a4bdb6e437baa4efcb8cf777d4caeaf069e4.zip
system_core-8071a4bdb6e437baa4efcb8cf777d4caeaf069e4.tar.gz
system_core-8071a4bdb6e437baa4efcb8cf777d4caeaf069e4.tar.bz2
Make adb pull use . as the target file directory if you don't supply one.
Diffstat (limited to 'adb')
-rw-r--r--adb/commandline.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/adb/commandline.c b/adb/commandline.c
index 7cd77e0..2f429ef 100644
--- a/adb/commandline.c
+++ b/adb/commandline.c
@@ -110,7 +110,7 @@ void help()
"\n"
"device commands:\n"
" adb push <local> <remote> - copy file/dir to device\n"
- " adb pull <remote> <local> - copy file/dir from device\n"
+ " adb pull <remote> [<local>] - copy file/dir from device\n"
" adb sync [ <directory> ] - copy host->device only if changed\n"
" (see 'adb help all')\n"
" adb shell - run remote shell interactively\n"
@@ -1022,8 +1022,13 @@ top:
}
if(!strcmp(argv[0], "pull")) {
- if(argc != 3) return usage();
- return do_sync_pull(argv[1], argv[2]);
+ if (argc == 2) {
+ return do_sync_pull(argv[1], ".");
+ } else if (argc == 3) {
+ return do_sync_pull(argv[1], argv[2]);
+ } else {
+ return usage();
+ }
}
if(!strcmp(argv[0], "install")) {