22191c30a6
Relative paths were being prefixed with OS_PATH_SEPARATOR on unix and win32 causing adb to incorrectly try to make directories at the root. Plus, absolute paths didn't work on win32 (C: got prefixed into \C:). This fix is to use dirname (available on win32 via mingw's crt) to do the messy parsing. I added a test for the relative path case. Change-Id: Ibb0a4a8ec7756351d252a4d267122ab18e182858 Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
47 lines
1.7 KiB
C++
47 lines
1.7 KiB
C++
/*
|
|
* Copyright (C) 2015 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef _ADB_UTILS_H_
|
|
#define _ADB_UTILS_H_
|
|
|
|
#include <string>
|
|
|
|
bool getcwd(std::string* cwd);
|
|
bool directory_exists(const std::string& path);
|
|
|
|
// Like the regular basename and dirname, but thread-safe on all
|
|
// platforms and capable of correctly handling exotic Windows paths.
|
|
std::string adb_basename(const std::string& path);
|
|
std::string adb_dirname(const std::string& path);
|
|
|
|
bool mkdirs(const std::string& path);
|
|
|
|
std::string escape_arg(const std::string& s);
|
|
|
|
void dump_hex(const void* ptr, size_t byte_count);
|
|
|
|
// Parses 'address' into 'host' and 'port'.
|
|
// If no port is given, takes the default from *port.
|
|
// 'canonical_address' then becomes "host:port" or "[host]:port" as appropriate.
|
|
// Note that no real checking is done that 'host' or 'port' is valid; that's
|
|
// left to getaddrinfo(3).
|
|
// Returns false on failure and sets *error to an appropriate message.
|
|
bool parse_host_and_port(const std::string& address,
|
|
std::string* canonical_address,
|
|
std::string* host, int* port,
|
|
std::string* error);
|
|
|
|
#endif
|