Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d063d60f67f51b77f28be7a27fd953ea8c3b9df2
commit d063d60f67f51b77f28be7a27fd953ea8c3b9df2
Author: James Buren <r...@frugalware.org>
Date: Sat Feb 16 00:42:15 2013 -0600
lesspipe-1.82-1-x86_64
* revise code2color source
diff --git a/source/base/lesspipe/code2color.c
b/source/base/lesspipe/code2color.c
index 7727634..792efac 100644
--- a/source/base/lesspipe/code2color.c
+++ b/source/base/lesspipe/code2color.c
@@ -45,12 +45,20 @@ static bool mode2_args(int argc,char **argv,struct args
*args)
return true;
}
-static void normal_output(void)
+static void normal_output(struct args *args)
{
+ FILE *f = 0;
char line[LINE_MAX] = {0};
- while(fgets(line,sizeof(line),stdin))
+ f = fopen(args->input,"rb");
+
+ if(f == 0)
+ return;
+
+ while(fgets(line,sizeof(line),f))
fprintf(stdout,"%s",line);
+
+ fclose(f);
}
static void highlight_output(struct args *args)
@@ -70,8 +78,11 @@ extern int main(int argc,char **argv)
struct args args = {0};
struct stat st = {0};
- if(stat("/usr/bin/source-highlight",&st) == -1 ||
(!mode1_args(argc,argv,&args) && !mode2_args(argc,argv,&args)))
- normal_output();
+ if(!mode1_args(argc,argv,&args) && !mode2_args(argc,argv,&args))
+ return EXIT_FAILURE;
+
+ if(stat("/usr/bin/source-highlight",&st) == -1)
+ normal_output(&args);
else
highlight_output(&args);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
