mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 16:41:58 +00:00
658f29a51e
Pull in recent changes from the main dtc repository. These changes primarily allow multiple device trees to be declared which are merged by dtc. This feature allows us to include a basic dts file and then provide more information for the specific system through the merging functionality. Changes pulled from git://git.jdl.com/software/dtc.git commit id: 37c0b6a0, "dtc: Add code to make diffing trees easier" Signed-off-by: John Bonesio <bones@secretlab.ca> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
60 lines
1.4 KiB
C
60 lines
1.4 KiB
C
/*
|
|
* Copyright 2008 Jon Loeliger, Freescale Semiconductor, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
* USA
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
#include <string.h>
|
|
|
|
#include "util.h"
|
|
|
|
char *xstrdup(const char *s)
|
|
{
|
|
int len = strlen(s) + 1;
|
|
char *dup = xmalloc(len);
|
|
|
|
memcpy(dup, s, len);
|
|
|
|
return dup;
|
|
}
|
|
|
|
char *join_path(const char *path, const char *name)
|
|
{
|
|
int lenp = strlen(path);
|
|
int lenn = strlen(name);
|
|
int len;
|
|
int needslash = 1;
|
|
char *str;
|
|
|
|
len = lenp + lenn + 2;
|
|
if ((lenp > 0) && (path[lenp-1] == '/')) {
|
|
needslash = 0;
|
|
len--;
|
|
}
|
|
|
|
str = xmalloc(len);
|
|
memcpy(str, path, lenp);
|
|
if (needslash) {
|
|
str[lenp] = '/';
|
|
lenp++;
|
|
}
|
|
memcpy(str+lenp, name, lenn+1);
|
|
return str;
|
|
}
|