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

Commit 1c3b03b9 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merged 2b5f84a1 w/minor conflicts

parents 1b6aee15 2b5f84a1

tools/localize/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -53,4 +53,3 @@ ifeq (a,a) 
endif



include $(BUILD_HOST_EXECUTABLE)

tools/localize/file_utils.cpp

+35 −1
Original line number Diff line number Diff line
@@ -3,15 +3,49 @@ 
#include <unistd.h>

#include "file_utils.h"

#include "Perforce.h"

#include <utils/String8.h>

#include <sys/fcntl.h>

#include <sys/stat.h>

#include <errno.h>

#include <string.h>

#include <stdlib.h>

#include <cstdio>

#include <host/Directories.h>

#include "log.h"



using namespace android;

using namespace std;



static string

parent_dir(const string& path)

{

    return string(String8(path.c_str()).getPathDir().string());

}



static int

mkdirs(const char* last)

{

    String8 dest;

    const char* s = last-1;

    int err;

    do {

        s++;

        if (s > last && (*s == '.' || *s == 0)) {

            String8 part(last, s-last);

            dest.appendPath(part);

#ifdef HAVE_MS_C_RUNTIME

            err = _mkdir(dest.string());

#else                    

            err = mkdir(dest.string(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP);

#endif                    

            if (err != 0) {

                return err;

            }

            last = s+1;

        }

    } while (*s);

    return 0;

}



string

translated_file_name(const string& file, const string& locale)

{