From: Christoph Egger Subject: [PATCH][TOOLS] libxl: Implement libxl_basename() Date: Wed, 15 Dec 2010 14:37:47 +0100 Message-ID: <201012151437.47963.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_rSMCN+iX2Qf0nVQ" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --Boundary-00=_rSMCN+iX2Qf0nVQ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi! This patch implements libxl_basename() as a portable replacement for GNU vs. POSIX basename. Signed-off-by: Christoph Egger P.S. This patch requires 'libxl: constify libxl_create_cpupool()' to compile. -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_rSMCN+iX2Qf0nVQ Content-Type: text/x-diff; charset="iso 8859-15"; name="xen_libxl_basename.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_libxl_basename.diff" Content-Description: xen_libxl_basename.diff diff -r 8a3f14eda1c5 -r 1044405ba1d1 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -43,6 +43,20 @@ static struct schedid_name schedid_name[ { NULL, -1 } }; +const char *libxl_basename(const char *name) +{ + const char *filename; + if (name == NULL) + return strdup("."); + if (name[0] == '\0') + return strdup("."); + + filename = strrchr(name, '/'); + if (filename) + return strdup(filename+1); + return strdup(name); +} + unsigned long libxl_get_required_shadow_memory(unsigned long maxmem_kb, unsigned int smp_cpus) { /* 256 pages (1MB) per vcpu, diff -r 8a3f14eda1c5 -r 1044405ba1d1 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -18,6 +18,7 @@ #include "libxl.h" +const char *libxl_basename(const char *name); unsigned long libxl_get_required_shadow_memory(unsigned long maxmem_kb, unsigned int smp_cpus); int libxl_name_to_domid(libxl_ctx *ctx, const char *name, uint32_t *domid); char *libxl_domid_to_name(libxl_ctx *ctx, uint32_t domid); diff -r 8a3f14eda1c5 -r 1044405ba1d1 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5365,7 +5365,7 @@ int main_cpupoolcreate(int argc, char ** int config_len = 0; XLU_Config *config; const char *buf; - char *name; + const char *name; const char *sched; uint32_t poolid; int schedid = -1; @@ -5455,7 +5455,7 @@ int main_cpupoolcreate(int argc, char ** if (!xlu_cfg_get_string (config, "name", &buf)) name = strdup(buf); else - name = basename(filename); + name = libxl_basename(filename); if (!libxl_name_to_cpupoolid(&ctx, name, &poolid)) { fprintf(stderr, "Pool name \"%s\" already exists\n", name); return -ERROR_FAIL; --Boundary-00=_rSMCN+iX2Qf0nVQ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_rSMCN+iX2Qf0nVQ--