Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 286bb6dd authored by Dan Albert's avatar Dan Albert
Browse files

Revert "Turn on -Wformat-nonliteral." 

One of my build aliases doesn't play nice with USE_MINGW=1, so my build lied to me. Will revert until I fix it up.

This reverts commit 459df8f3.

Change-Id: I7905c5ae5ee85fb2d228ce63d81c79f140998c18
parent 459df8f3

adb/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -15,9 +15,8 @@ adb_version := $(shell git -C $(LOCAL_PATH) rev-parse --short=12 HEAD 2>/dev/nul 


ADB_COMMON_CFLAGS := \

    -Wall -Wextra -Werror \

    -Wformat-nonliteral \

    -Wno-missing-field-initializers \

    -Wno-unused-parameter \

    -Wno-missing-field-initializers \

    -DADB_REVISION='"$(adb_version)"' \



# libadb

adb/adb.h

+2 −2
Original line number Diff line number Diff line
@@ -277,8 +277,8 @@ asocket *create_remote_socket(unsigned id, atransport *t); 
void connect_to_remote(asocket *s, const char *destination);

void connect_to_smartsocket(asocket *s);



void fatal(const char *fmt, ...) ATTRIBUTE_FORMAT(1, 2);

void fatal_errno(const char *fmt, ...) ATTRIBUTE_FORMAT(1, 2);

void fatal(const char *fmt, ...);

void fatal_errno(const char *fmt, ...);



void handle_packet(apacket *p, atransport *t);

adb/adb_auth_host.cpp

+40 −36
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include "mincrypt/rsa.h"

#undef RSA_verify



#include <base/logging.h>

#include <base/strings.h>

#include <cutils/list.h>
@@ -57,10 +56,8 @@ 
#include <openssl/base64.h>

#endif



#include "adb_utils.h"



const char kAndroidPath[] = ".android";

const char kAdbKeyFile[] = "adbkey";

#define ANDROID_PATH   ".android"

#define ADB_KEY_FILE   "adbkey"



struct adb_private_key {

    struct listnode node;
@@ -298,58 +295,64 @@ static int read_key(const char *file, struct listnode *list) 
    return 1;

}



static bool get_user_keyfilepath(std::string* filename) {

    CHECK(filename != nullptr);



static int get_user_keyfilepath(char *filename, size_t len)

{

    const char *format, *home;

    char android_dir[PATH_MAX];

    struct stat buf;

#ifdef _WIN32

    const char* home = getenv("ANDROID_SDK_HOME");

    if (home == nullptr) {

    char path[PATH_MAX];

    home = getenv("ANDROID_SDK_HOME");

    if (!home) {

        SHGetFolderPath(NULL, CSIDL_PROFILE, NULL, 0, path);

        home = path;

    }

    format = "%s\\%s";

#else

    const char* home = getenv("HOME");

    if (home == nullptr)

        return false;

    home = getenv("HOME");

    if (!home)

        return -1;

    format = "%s/%s";

#endif



    D("home '%s'\n", home);



    const std::string android_dir = android::base::Join(

        std::vector<std::string>({home, kAndroidPath}), OS_PATH_SEPARATOR);

    if (snprintf(android_dir, sizeof(android_dir), format, home,

                        ANDROID_PATH) >= (int)sizeof(android_dir))

        return -1;



    if (!directory_exists(android_dir)) {

        if (adb_mkdir(android_dir.c_str(), 0750) == -1) {

            D("Cannot mkdir '%s'", android_dir.c_str());

            return false;

    if (stat(android_dir, &buf)) {

        if (adb_mkdir(android_dir, 0750) < 0) {

            D("Cannot mkdir '%s'", android_dir);

            return -1;

        }

    }



    *filename = android::base::Join(

        std::vector<std::string>({android_dir, kAdbKeyFile}),

        OS_PATH_SEPARATOR);

    return true;

    return snprintf(filename, len, format, android_dir, ADB_KEY_FILE);

}



static int get_user_key(struct listnode *list)

{

    std::string path;

    if (!get_user_keyfilepath(&path)) {

    struct stat buf;

    char path[PATH_MAX];

    int ret;



    ret = get_user_keyfilepath(path, sizeof(path));

    if (ret < 0 || ret >= (signed)sizeof(path)) {

        D("Error getting user key filename");

        return 0;

    }



    D("user key '%s'\n", path.c_str());

    D("user key '%s'\n", path);



    if (!file_exists(path)) {

        if (!generate_key(path.c_str())) {

    if (stat(path, &buf) == -1) {

        if (!generate_key(path)) {

            D("Failed to generate new key\n");

            return 0;

        }

    }



    return read_key(path.c_str(), list);

    return read_key(path, list);

}



static void get_vendor_keys(struct listnode* key_list) {
@@ -408,26 +411,27 @@ void *adb_auth_nextkey(void *current) 


int adb_auth_get_userkey(unsigned char *data, size_t len)

{

    std::string path;

    if (!get_user_keyfilepath(&path)) {

    char path[PATH_MAX];

    int ret = get_user_keyfilepath(path, sizeof(path) - 4);

    if (ret < 0 || ret >= (signed)(sizeof(path) - 4)) {

        D("Error getting user key filename");

        return 0;

    }

    path += ".pub";

    strcat(path, ".pub");



    // TODO(danalbert): ReadFileToString

    // Note that on Windows, load_file() does not do CR/LF translation, but

    // ReadFileToString() uses the C Runtime which uses CR/LF translation by

    // default (by is overridable with _setmode()).

    unsigned size;

    void* file_data = load_file(path.c_str(), &size);

    char* file_data = reinterpret_cast<char*>(load_file(path, &size));

    if (file_data == nullptr) {

        D("Can't load '%s'\n", path.c_str());

        D("Can't load '%s'\n", path);

        return 0;

    }



    if (len < (size_t)(size + 1)) {

        D("%s: Content too large ret=%d\n", path.c_str(), size);

        D("%s: Content too large ret=%d\n", path, size);

        free(file_data);

        return 0;

    }

adb/adb_io.h

+1 −3
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 


#include <string>



#include "base/macros.h"



// Sends the protocol "OKAY" message.

bool SendOkay(int fd);
@@ -56,6 +54,6 @@ bool WriteFdExactly(int fd, const char* s); 
bool WriteFdExactly(int fd, const std::string& s);



// Same as above, but formats the string to send.

bool WriteFdFmt(int fd, const char* fmt, ...) ATTRIBUTE_FORMAT(2, 3);

bool WriteFdFmt(int fd, const char* fmt, ...) __attribute__((__format__(__printf__, 2, 3)));



#endif /* ADB_IO_H */

adb/adb_utils.cpp

+0 −5
Original line number Diff line number Diff line
@@ -42,11 +42,6 @@ bool directory_exists(const std::string& path) { 
  return lstat(path.c_str(), &sb) != -1 && S_ISDIR(sb.st_mode);

}



bool file_exists(const std::string& path) {

  struct stat sb;

  return lstat(path.c_str(), &sb) != -1 && S_ISREG(sb.st_mode);

}



std::string escape_arg(const std::string& s) {

  std::string result = s;