Commit graph

1669 commits

Author SHA1 Message Date
Josh Gao
cc5b2c737b Merge "adb: fix clang-format for access modifier dedent." am: d5126ddf71
am: 728da79e9c

* commit '728da79e9c973f02c97847ed49b81d0d3018484f':
  adb: fix clang-format for access modifier dedent.
2016-02-18 23:44:15 +00:00
Josh Gao
d5126ddf71 Merge "adb: fix clang-format for access modifier dedent." 2016-02-18 23:00:51 +00:00
Josh Gao
5da522ec45 adb: fix clang-format for access modifier dedent.
It was previously -1 (the default from Google style, since it uses 2
space indentation), instead of -2.

Change-Id: I1865505ce17a2cc13b85de58bda55c3b1dfcf08c
2016-02-18 14:52:07 -08:00
Dimitry Ivanov
d362cc5da9 Merge "Add missing liblog dependency"
am: 8b68829c06

* commit '8b68829c06bf6acaae20d632d7f210c58692f73e':
  Add missing liblog dependency
2016-02-13 04:58:45 +00:00
Dimitry Ivanov
01f21da732 Add missing liblog dependency
Bug: http://b/27171986
Change-Id: Ia7f03c72de9a8e5d61896bde6b4b1af396376f54
2016-02-12 18:40:29 -08:00
Josh Gao
731b519cbf Merge "adb: sysdeps_win32: actually change ExitThread to _endthreadex."
am: 519f9aea43

* commit '519f9aea436b957371061544da380cebc2cafb96':
  adb: sysdeps_win32: actually change ExitThread to _endthreadex.
2016-02-13 00:13:23 +00:00
Josh Gao
1c98db1ab1 Merge "adb: make adb_thread_func_t return void, add adb_thread_exit."
am: 69c81c75df

* commit '69c81c75df2e196aea679d24464a68233dcb5393':
  adb: make adb_thread_func_t return void, add adb_thread_exit.
2016-02-13 00:12:50 +00:00
Josh Gao
d7b3749202 adb: sysdeps_win32: actually change ExitThread to _endthreadex.
Forgot to amend this into b5fea14e.

Change-Id: Id04e639eb87043901681db789d7a7925300fa867
2016-02-12 15:47:19 -08:00
Josh Gao
69c81c75df Merge "adb: make adb_thread_func_t return void, add adb_thread_exit." 2016-02-12 23:42:49 +00:00
Josh Gao
0a508d35e7 Merge "adb: mkdirs fixes"
am: 7fea044de9

* commit '7fea044de9c7c941360b7af5efff79d2e8e98e37':
  adb: mkdirs fixes
2016-02-12 23:29:59 +00:00
Josh Gao
b5fea14e13 adb: make adb_thread_func_t return void, add adb_thread_exit.
Windows restricts the return value of threads to 32-bits, even on 64-bit
platforms. Since we don't actually return meaningful values from thread,
resolve this inconsistency with POSIX by making adb's thread abstraction
only take void functions.

Change-Id: I5c23b4432314f13bf16d606fd5e6b6b7b6ef98b5
2016-02-12 15:23:54 -08:00
Josh Gao
7fea044de9 Merge "adb: mkdirs fixes" 2016-02-12 23:18:36 +00:00
Josh Gao
2c54fa5460 Merge "adb: redact reference to secret internal time machine."
am: e8a974091a

* commit 'e8a974091ae5d8846d6f326f7430e84f90782d2e':
  adb: redact reference to secret internal time machine.
2016-02-12 19:58:39 +00:00
Josh Gao
6b42a2bfd5 adb: redact reference to secret internal time machine.
Change-Id: Ic6744cc7c858576d7e6172460b32902e007b6fd3
2016-02-12 11:33:53 -08:00
Josh Gao
90c9c6ce15 Merge "adb: sysdeps: add support for joining threads."
am: dda68c0fcf

* commit 'dda68c0fcfe4ced4ae410821c7681f02a2b9aff2':
  adb: sysdeps: add support for joining threads.
2016-02-11 01:32:05 +00:00
Josh Gao
dda68c0fcf Merge "adb: sysdeps: add support for joining threads." 2016-02-11 01:10:12 +00:00
Spencer Low
85c45bd5a1 adb: mkdirs fixes
Fix pathological case where the directory to be created can't be created
because there is already a file there. This was previously returning
success because the wrong var was passed to directory_exists().

Fix test to exercise this situation. Also clarify tests.

Change-Id: I0dc0f14084e0eda4e1498874d4ab2a6445d322ac
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2016-02-10 15:03:50 -08:00
Josh Gao
3b3e10d046 adb: sysdeps: add support for joining threads.
Bug: http://b/27105824
Change-Id: I44e4edbb2a59565c35f1f3e6a6394ac258591f95
2016-02-10 14:22:58 -08:00
Josh Gao
b3a6e343fb Merge "adb: allow wine\'s output for sysdeps_win32 strerror test."
am: 76d3308dd2

* commit '76d3308dd27a73e7ec0617f8438d24d0165a2d01':
  adb: allow wine's output for sysdeps_win32 strerror test.
2016-02-10 21:50:33 +00:00
Josh Gao
76d3308dd2 Merge "adb: allow wine's output for sysdeps_win32 strerror test." 2016-02-10 21:39:31 +00:00
Josh Gao
22554c9167 adb: allow wine's output for sysdeps_win32 strerror test.
Change-Id: Ia5d04a2347df1bcd8c7efcc1da9cec9725007a58
2016-02-10 13:38:32 -08:00
Yabin Cui
617fe1eb6d Merge "adb: setsid() for adb host server."
am: 250f5956d6

* commit '250f5956d69c87ab573d4593951616997c3317c0':
  adb: setsid() for adb host server.
2016-02-10 06:22:58 +00:00
Yabin Cui
6bf323b97a adb: setsid() for adb host server.
To create a daemon for adb host server, we should call setsid()
for the daemon process. However, previously we call setsid() for
the adb client process, which results in nothing but EPERM error.

Bug: 26982628
Change-Id: I2763ae3d5a243706927d7ef6af5095138c0ce2d8
2016-02-09 16:15:56 -08:00
Josh Gao
13aba88488 Merge "adb: make ctrl-c when spawning a daemon not kill the daemon."
am: b2803b5060

* commit 'b2803b5060b3a790277bf17a97651c30102a183a':
  adb: make ctrl-c when spawning a daemon not kill the daemon.
2016-02-09 01:13:46 +00:00
Josh Gao
cba3b1888e Merge "adb: fix mkdirs test."
am: 1a34944cde

* commit '1a34944cde5c8241bb74cde992d09f9115d5b53a':
  adb: fix mkdirs test.
2016-02-09 01:10:04 +00:00
Josh Gao
b2803b5060 Merge "adb: make ctrl-c when spawning a daemon not kill the daemon." 2016-02-09 01:05:18 +00:00
Josh Gao
b72b3f8c92 adb: make ctrl-c when spawning a daemon not kill the daemon.
Previously, using ctrl-c in a command that needs to spawn a daemon
because one isn't already available would kill the daemon along with the
foreground process.

Bug: http://b/26982628
Change-Id: I7fefc531c3e4895423e7b466322b5426d01dc9ef
2016-02-08 16:59:10 -08:00
Josh Gao
1172b2ec71 adb: fix mkdirs test.
The behavior of mkdirs was changed a while ago, without updating the
test.

Change-Id: I2aaa73818933b281e911c42a14e3c843d8bd972a
2016-02-08 11:22:50 -08:00
Josh Gao
3a45f945c7 Merge "adb: don\'t append a slash to a path that already ends with one." am: aae1eb2c4f
am: 4b09d2f084

* commit '4b09d2f084dfe2df3314a10c59090be2c97b9a9e':
  adb: don't append a slash to a path that already ends with one.
2016-02-04 02:35:31 +00:00
Elliott Hughes
2b012f2059 Merge "adb: win32: fix start-server to properly display UTF-8 on the console" am: 1617dd4fe9
am: 89df186cda

* commit '89df186cdab8eb21c7610de9a8348b6f050543d7':
  adb: win32: fix start-server to properly display UTF-8 on the console
2016-02-04 02:35:25 +00:00
Josh Gao
d8e0108418 Merge "adb: report subprocess creation errors to the client." am: 7aa7a81eb1
am: 046bf3b212

* commit '046bf3b212e9a01c3f2671c208ae3bfc8fdcd62b':
  adb: report subprocess creation errors to the client.
2016-02-04 02:35:12 +00:00
Josh Gao
6832ddbc98 Merge "adb: fix mistaken uses of SendFail in file_sync_service.cpp." am: 2d2185ee09
am: f2610942ef

* commit 'f2610942efca1857c377df4f427ffaa3eefe65e8':
  adb: fix mistaken uses of SendFail in file_sync_service.cpp.
2016-02-04 02:35:06 +00:00
Josh Gao
aae1eb2c4f Merge "adb: don't append a slash to a path that already ends with one." 2016-02-04 00:36:32 +00:00
Spencer Low
53a0a99fe8 adb: win32: fix start-server to properly display UTF-8 on the console
fwrite() is a macro that maps to adb_fwrite(), which can write UTF-8 to
the console. Use it to write the output that comes from the subprocess
adb server.

To do this, dup the stdout/stderr file descriptor and make a duplicate
FILE* stream, in binary mode (since we're reading raw bytes from the
subprocess), and unbuffered.

Change-Id: I480761bae0bd576dc9e03fa4d31266f4e49635ed
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2016-02-03 16:24:37 -08:00
Josh Gao
323899b6d3 adb: don't append a slash to a path that already ends with one.
Bug: http://b/26964908
Change-Id: I1fbd752fd97f5414a306b46f7bfce3373362f8b3
2016-02-03 16:24:13 -08:00
Josh Gao
4323507a7e adb: report subprocess creation errors to the client.
Bug: http://b/26589627
Change-Id: I38e7a33ea8274f0eb47dc0ed87fcbca08a0ab22a
2016-02-03 15:52:07 -08:00
Josh Gao
6ad06b9ea9 adb: fix mistaken uses of SendFail in file_sync_service.cpp.
SendFail and SendSyncFail are similarly named, and have the same
prototype. Use `#pragma GCC poison` to prevent use of SendFail in
file_sync_service.cpp, and fix the places where it was used
accidentally.

Change-Id: I6b9a7e565b76dfab10f8ae38f889d046ad80a403
2016-02-03 23:50:32 +00:00
David Pursell
fc04da8540 Merge "adb: win32: handle incomplete UTF-8 in console output, other fixes" am: 85c65dab42
am: 8467ab758c

* commit '8467ab758ccc99391dddfc875377052d89f46697':
  adb: win32: handle incomplete UTF-8 in console output, other fixes
2016-02-01 20:57:04 +00:00
David Pursell
85c65dab42 Merge "adb: win32: handle incomplete UTF-8 in console output, other fixes" 2016-02-01 20:49:25 +00:00
David Pursell
488275b8f6 Merge "base: add SystemErrorCodeToString() function." am: 79d8f07a6f
am: cbb5d714d7

* commit 'cbb5d714d79dbc785a90fd17082227321cee9d92':
  base: add SystemErrorCodeToString() function.
2016-02-01 20:45:39 +00:00
David Pursell
79d8f07a6f Merge "base: add SystemErrorCodeToString() function." 2016-02-01 20:39:09 +00:00
David Pursell
5f787ed2b3 base: add SystemErrorCodeToString() function.
Pulls the Windows error string generation out of adb into libbase so
that it can be used by fastboot as well. Also makes a Unix equivalent
that just wraps strerror() so that upcoming fastboot error reporting
code can be platform-independent.

The intent here is just to provide a portable way to report an error to
the user. More general cross-platform error handling is out of scope.

Bug: http://b/26236380
Change-Id: I5a784a844775949562d069bb41dcb0ebd13a32bc
2016-02-01 12:18:26 -08:00
Josh Gao
da870abcf4 Merge changes I93287b87,I30a3eb0b am: d18aea9974
am: 831bd4f043

* commit '831bd4f0436a81c5ebf9ec4417948b8195cb01d6':
  adb: add nullability specifiers to adb_client.h.
  adb: add adb_get_feature_set.
2016-02-01 18:54:04 +00:00
Josh Gao
d18aea9974 Merge changes I93287b87,I30a3eb0b
* changes:
  adb: add nullability specifiers to adb_client.h.
  adb: add adb_get_feature_set.
2016-02-01 18:48:13 +00:00
Josh Gao
a166e71e21 adb: add nullability specifiers to adb_client.h.
Change-Id: I93287b876cb06d871b4330d2733ef6f43c58fbbf
2016-01-31 19:22:04 -08:00
Josh Gao
f3f6a1d0d4 adb: add adb_get_feature_set.
Extract a feature set getter function from commandline.cpp.

Change-Id: I30a3eb0b060a88379e29be16264637816e378978
2016-01-31 19:12:26 -08:00
David Pursell
7fd384bf77 Merge "adb: fix subprocess termination for legacy shell." am: a9352202dd
am: 4c0a6a1677

* commit '4c0a6a16772700146c4edb894af46f90138e9170':
  adb: fix subprocess termination for legacy shell.
2016-01-29 22:20:40 +00:00
David Pursell
a9352202dd Merge "adb: fix subprocess termination for legacy shell." 2016-01-29 22:14:46 +00:00
Josh Gao
f74da513c8 Merge "adb: SIGWINCH support for Windows" am: c1eb5ba0fb
am: 41b04cf896

* commit '41b04cf89677836dba14903226df5c7a3d39adcd':
  adb: SIGWINCH support for Windows
2016-01-29 22:08:22 +00:00
Spencer Low
2e02dc630f adb: SIGWINCH support for Windows
- Introduces unix_read_interruptible() which is like unix_read() except
  that it can return EINTR.

- The big idea is that the Windows ReadConsoleInput() API will return an
  event on window resize and then we return EINTR from
  unix_read_interruptible() just like Unix.

- Only handles horizontal resize since Windows doesn't seem to give an
  event for vertical resize when no special screen buffer is used. This
  should be sufficient for the primary use case of adb on Windows
  (people are not running vi in the first place).

Change-Id: Id8d1710b559834c8098f2d7fbecedf2d0ade4b88
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2016-01-28 23:01:56 -08:00