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

Commit 93ca79b4 authored by Johan Redestig's avatar Johan Redestig
Browse files

Allow more characters in partition name links 

We have several partitions with underscores in their names
which would not be properly linked in:
/dev/block/platform/msm_sdcc.1/by-name/

With this change more characters (_-.) are allowed in
partition name links. Also, any other character is
replaced with '_' so the resulting link names have the
same length as the partition name.

Change-Id: I746566c03db98b10326c755692362d2c10e528ae
parent 596ee9ea

init/devices.c

+2 −0
Original line number Diff line number Diff line
@@ -451,6 +451,8 @@ static char **parse_platform_block_device(struct uevent *uevent) 
    if (uevent->partition_name) {

        p = strdup(uevent->partition_name);

        sanitize(p);

        if (strcmp(uevent->partition_name, p))

            NOTICE("Linking partition '%s' as '%s'\n", uevent->partition_name, p);

        if (asprintf(&links[link_num], "%s/by-name/%s", link_path, p) > 0)

            link_num++;

        else

init/util.c

+16 −3
Original line number Diff line number Diff line
@@ -305,14 +305,27 @@ int mkdir_recursive(const char *pathname, mode_t mode) 
    return 0;

}



/*

 * replaces any unacceptable characters with '_', the

 * length of the resulting string is equal to the input string

 */

void sanitize(char *s)

{

    const char* accept =

            "abcdefghijklmnopqrstuvwxyz"

            "ABCDEFGHIJKLMNOPQRSTUVWXYZ"

            "0123456789"

            "_-.";



    if (!s)

        return;

    while (isalnum(*s))

        s++;

    *s = 0;



    for (; *s; s++) {

        s += strspn(s, accept);

        if (*s) *s = '_';

    }

}



void make_link(const char *oldpath, const char *newpath)

{

    int ret;