提交 38d299c2 编写于 作者: M Mike Frysinger 提交者: Wolfgang Denk

cleanup easylogo

- make the Makefile not suck
- include proper headers for prototypes
- fix obvious broken handling of strchr() when handling '.' in filenames
Signed-Off-By: NMike Frysinger <vapier@gentoo.org>
上级 883e3925
all: easylogo.c
gcc easylogo.c -o easylogo
CFLAGS += -Wall
all: easylogo
clean:
rm -f easylogo *.o
.PHONY: all clean
......@@ -8,6 +8,8 @@
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#pragma pack(1)
......@@ -41,7 +43,7 @@ typedef struct {
} yuyv_t ;
typedef struct {
unsigned char *data,
void *data,
*palette ;
int width,
height,
......@@ -352,9 +354,10 @@ int main (int argc, char *argv[])
strcpy (varname, argv[2]);
else
{
int pos = strchr(inputfile, '.');
char *dot = strchr(inputfile, '.');
int pos = dot - inputfile;
if (pos >= 0)
if (dot)
{
strncpy (varname, inputfile, pos);
varname[pos] = 0 ;
......@@ -365,13 +368,15 @@ int main (int argc, char *argv[])
strcpy (outputfile, argv[3]);
else
{
int pos = strchr (varname, '.');
char *dot = strchr (varname, '.');
int pos = dot - varname;
if (pos > 0)
if (dot)
{
char app[DEF_FILELEN] ;
strncpy(app, varname, pos);
app[pos] = 0;
sprintf(outputfile, "%s.h", app);
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册