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

Commit f17f5591 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 36d44740: Merge "Fix a bunch of small system/core bugs." 

* commit '36d44740':
  Fix a bunch of small system/core bugs.
parents 0f26808e 36d44740

adb/file_sync_client.c

+1 −1
Original line number Diff line number Diff line
@@ -642,8 +642,8 @@ static int local_build_list(copyinfo **filelist, 
            ci = mkcopyinfo(lpath, rpath, name, 0);

            if(lstat(ci->src, &st)) {

                fprintf(stderr,"cannot stat '%s': %s\n", ci->src, strerror(errno));

                free(ci);

                closedir(d);



                return -1;

            }

            if(!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode)) {

adb/file_sync_service.c

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ static int do_list(int s, const char *path) 


            if(writex(s, &msg.dent, sizeof(msg.dent)) ||

               writex(s, de->d_name, len)) {

                closedir(d);

                return -1;

            }

        }

cpio/mkbootfs.c

+2 −0
Original line number Diff line number Diff line
@@ -220,6 +220,8 @@ static void _archive_dir(char *in, char *out, int ilen, int olen) 
        free(names[i]);

    }

    free(names);



    closedir(d);

}



static void _archive(char *in, char *out, int ilen, int olen)

fastboot/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../mkbootimg \ 
LOCAL_SRC_FILES := protocol.c engine.c bootimg.c fastboot.c util.c

LOCAL_MODULE := fastboot

LOCAL_MODULE_TAGS := debug

LOCAL_CFLAGS += -std=gnu99



ifeq ($(HOST_OS),linux)

  LOCAL_SRC_FILES += usb_linux.c util_linux.c

fastboot/fastboot.c

+7 −1
Original line number Diff line number Diff line
@@ -449,7 +449,13 @@ static int setup_requirement_line(char *name) 


    for(n = 0; n < count; n++) {

        out[n] = strdup(strip(val[n]));

        if (out[n] == 0) return -1;

        if (out[n] == 0) {

            for(size_t i = 0; i < n; ++i) {

                free((char*) out[i]);

            }

            free(out);

            return -1;

        }

    }



    fb_queue_require(prod, name, invert, n, out);