diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-11-09 12:07:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-09 12:07:42 -0800 |
| commit | c923980e785c533e41e403e9644368643dbac952 (patch) | |
| tree | 8d847011fbe757a3016b7b6409294400f6911bf1 /adb/commandline.c | |
| parent | ac61a69b235110a17493f8e05e5a2467476965fc (diff) | |
| parent | ef063fe3066153dab5389b6baba6cb4e36888106 (diff) | |
| download | system_core-c923980e785c533e41e403e9644368643dbac952.tar.gz system_core-c923980e785c533e41e403e9644368643dbac952.tar.bz2 system_core-c923980e785c533e41e403e9644368643dbac952.zip | |
am ef063fe3: merge from open-source master
Merge commit 'ef063fe3066153dab5389b6baba6cb4e36888106'
* commit 'ef063fe3066153dab5389b6baba6cb4e36888106':
Add support for Acer devices
FreeBSD support for usb-connected devices in adb
Make get_my_path() safer
Fix use of memset function
Diffstat (limited to 'adb/commandline.c')
| -rw-r--r-- | adb/commandline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/adb/commandline.c b/adb/commandline.c index 0edd1e13..aad8e602 100644 --- a/adb/commandline.c +++ b/adb/commandline.c @@ -50,7 +50,7 @@ enum { static int do_cmd(transport_type ttype, char* serial, char *cmd, ...); -void get_my_path(char s[PATH_MAX]); +void get_my_path(char *s, size_t maxLen); int find_sync_dirs(const char *srcarg, char **android_srcdir_out, char **data_srcdir_out); int install_app(transport_type transport, char* serial, int argc, char** argv); @@ -673,7 +673,7 @@ static char *find_top(char path_buf[PATH_MAX]) /* If the CWD isn't under a good-looking top, see if the * executable is. */ - get_my_path(dir); + get_my_path(dir, PATH_MAX); top = find_top_from(dir, path_buf); } return top; |