Attachment 1471 Details for Bug 1920 – simplify image name generation

[patch] simplify image name generation

WrFFrI-image_name-6.8.1.patch (text/plain), 1.87 KB, created by Alex Riesen on 2004-12-04 15:06:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Riesen

Created: 2004-12-04 15:06:19 UTC

Size: 1.87 KB

patch

obsolete

>--- a/xc/extras/Xpm/lib/WrFFrI.c	2004-09-15 17:47:39.000000000 +0200
>+++ b/xc/extras/Xpm/lib/WrFFrI.c	2004-12-04 23:28:42.282557910 +0100
>@@ -98,7 +102,7 @@ XpmWriteFileFromXpmImage(filename, image
>     XpmInfo *info;
> {
>     xpmData mdata;
>-    char *name, *dot, *s, new_name[BUFSIZ];
>+    char *name, new_name[BUFSIZ] = "image_name";
>     int ErrorStatus;
> 
>     /* open file to write */
>@@ -106,43 +110,38 @@ XpmWriteFileFromXpmImage(filename, image
> 	return (ErrorStatus);
> 
>     /* figure out a name */
>+    name = new_name;
>     if (filename) {
>-#ifdef VMS
>-	name = filename;
>-#else
>-	if (!(name = rindex(filename, '/'))
>+	const char* s = filename + strlen(filename);
>+	name = new_name + sizeof(new_name);
>+	*--name = '\0';
>+	while ( s > filename )
>+	{
>+	    --s;
>+#ifndef VMS /* filesystem has a structure: take only the last element */
>+	    if ( '/' == *s )
>+		break;
> #ifdef AMIGA
>-	    && !(name = rindex(filename, ':'))
>+	    if ( ':' == *s )
>+		break;
> #endif
>-     )
>-	    name = filename;
>-	else
>-	    name++;
> #endif
>-	/* let's try to make a valid C syntax name */
>-	if (index(name, '.')) {
>-	    strcpy(new_name, name);
>-	    /* change '.' to '_' */
>-	    name = s = new_name;
>-	    while ((dot = index(s, '.'))) {
>-		*dot = '_';
>-		s = dot;
>+	    if ( new_name == name )
>+		break;
>+	    --name;
>+	    switch ( *s )
>+	    {
>+	    case '.':
>+	    case '-':
>+		*name = '_';
>+		break;
>+	    default:
>+		*name = *s <= 32 ? '_': *s;
> 	    }
>+	    /* if ( !strcmp(s, ".Z") || !strcmp(s, ".gz") )
>+		name = new_name + sizeof(new_name) - 1; */
> 	}
>-	if (index(name, '-')) {
>-	    if (name != new_name) {
>-		strcpy(new_name, name);
>-		name = new_name;
>-	    }
>-	    /* change '-' to '_' */
>-	    s = name;
>-	    while ((dot = index(s, '-'))) {
>-		*dot = '_';
>-		s = dot;
>-	    }
>-	}
>-    } else
>-	name = "image_name";
>+    }
> 
>     /* write the XpmData from the XpmImage */
>     if (ErrorStatus == XpmSuccess)

Actions: View | Splinter Review

Attachments on bug 1920: 1406 | 1469 | 1470 | 1471 | 1489 | 1490 | 1514 | 1903 | 1908 | 1909

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.