hugok
/
e16
forked from e16/e16
1
0
Fork 0
Code Pull Requests Activity

fixed the bug in dox as was found this morning 

SVN revision: 539
This commit is contained in:
Mandrake 1999-10-01 17:30:29 +00:00
parent 998a1a8e34
commit 3bd55c8bdc
3 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dox/dox.c
View File

@ -157,8 +157,7 @@ XClearWindow(disp, win_text); \
} \
}
int
int
main(int argc, char **argv)
{
int pagenum;
@ -204,13 +203,12 @@ main(int argc, char **argv)
if (argc < 2)
{
printf("usage:\n"
"%s [-page page_number] [-file Edoc_fname] [-size width height] Edoc_dir\n",
"%s [-page page_number] [-file Edoc_fname] [-size width height] Edoc_dir\n",
argv[0]);
exit(1);
}
docdir=".";
docfile="MAIN";
docdir = ".";
docfile = "MAIN";
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-page")) && (i < (argc - 1)))
@ -238,7 +236,7 @@ main(int argc, char **argv)
Esetenv("DISPLAY", DisplayString(disp), 1);
Esetenv("E_DATADIR", ENLIGHTENMENT_ROOT, 1);
Esetenv("E_BINDIR", ENLIGHTENMENT_BIN, 1);
t = 16;
GetObjects(f);
fclose(f);
@ -273,8 +271,9 @@ main(int argc, char **argv)
XMapWindow(disp, win_main);
XSync(disp, False);
page_hist = malloc(sizeof(int));
page_hist[0] = 0;
for (;;)
{
KeySym key;
@ -354,8 +353,8 @@ main(int argc, char **argv)
{
if (!fork())
{
char *exe;
char *exe;
exe = &(ll->name[5]);
execl("/bin/sh", "/bin/sh", "-c", exe, NULL);
exit(0);
@ -363,9 +362,9 @@ main(int argc, char **argv)
}
else if (!strncmp("INPUT.", ll->name, 6))
{
FILE *p;
char *exe, tmp[1024];
FILE *p;
char *exe, tmp[1024];
exe = &(ll->name[6]);
if (exe[0] != '/')
{
@ -375,9 +374,9 @@ main(int argc, char **argv)
p = popen(exe, "r");
if (p)
{
int dirlen = 0;
char *sp;
int dirlen = 0;
char *sp;
sp = exe;
while ((*sp) && (*sp != ' '))
sp++;
@ -396,6 +395,7 @@ main(int argc, char **argv)
if (page_hist)
free(page_hist);
page_hist = malloc(sizeof(int));
page_hist[0] = 0;
page_hist_len = 1;
pagenum = 0;
@ -416,9 +416,9 @@ main(int argc, char **argv)
if (page_hist_pos >= page_hist_len)
{
page_hist_len++;
page_hist =
page_hist =
realloc(page_hist,
sizeof(int) * page_hist_len);
sizeof(int) * page_hist_len);
}
page_hist[page_hist_pos] = pagenum;
l = RenderPage(draw, pagenum, w, h);
@ -445,21 +445,22 @@ main(int argc, char **argv)
}
else if (ev.xbutton.window == win_next)
{
int prev_pagenum;
int prev_pagenum;
Imlib_apply_image(id, im_next1, win_next);
FREE_LINKS;
prev_pagenum = pagenum;
pagenum++;
pagenum = FixPage(pagenum);
if (pagenum != prev_pagenum)
{
FREE_LINKS;
page_hist_pos++;
if (page_hist_pos >= page_hist_len)
{
page_hist_len++;
page_hist = realloc(page_hist,
sizeof(int) * page_hist_len);
page_hist[page_hist_pos] = pagenum;
}
else

2
dox/dox.h
View File

@ -220,7 +220,7 @@ void AddObject(Object * obj);
void BuildObj(Object * obj, char *var, char *param);
int GetNextTag(Object * obj);
char *GetTextUntilTag(void);
int GetObjects(FILE *f);
int GetObjects(FILE * f);
int FixPage(int p);
int GetPage(char *name);
void GetLinkColors(int page_num, int *r, int *g, int *b);

42
dox/format.c
View File

@ -6,19 +6,19 @@ static char *fdat_ptr = NULL;
static int fdat_size = 0;
static char *fdat = NULL;
static int fdgetc(void);
static void fdjump(int count);
static int fdgetc(void);
static void fdjump(int count);
static int
fdgetc(void)
{
int val;
int val;
if (fdat_ptr >= (fdat + fdat_size))
return EOF;
val = (int)(*fdat_ptr);
fdat_ptr++;
return val;
val = (int)(*fdat_ptr);
fdat_ptr++;
return val;
}
static void
@ -340,15 +340,15 @@ GetObjects(FILE * f)
fdat_size += count;
}
fdat_ptr = fdat;
if (page)
{
int i;
int i;
for (i = 0; i < num_pages; i++)
{
int j;
int j;
if (page[i].name)
free(page[i].name);
if (page[i].background)
@ -358,20 +358,20 @@ GetObjects(FILE * f)
switch (page[i].obj[j].type)
{
case IMG:
if (((Img_ *)page[i].obj[j].object)->src)
free(((Img_ *)page[i].obj[j].object)->src);
if (((Img_ *)page[i].obj[j].object)->src2)
free(((Img_ *)page[i].obj[j].object)->src2);
if (((Img_ *)page[i].obj[j].object)->src3)
free(((Img_ *)page[i].obj[j].object)->src3);
if (((Img_ *)page[i].obj[j].object)->link)
free(((Img_ *)page[i].obj[j].object)->link);
if (((Img_ *) page[i].obj[j].object)->src)
free(((Img_ *) page[i].obj[j].object)->src);
if (((Img_ *) page[i].obj[j].object)->src2)
free(((Img_ *) page[i].obj[j].object)->src2);
if (((Img_ *) page[i].obj[j].object)->src3)
free(((Img_ *) page[i].obj[j].object)->src3);
if (((Img_ *) page[i].obj[j].object)->link)
free(((Img_ *) page[i].obj[j].object)->link);
break;
case BR:
break;
case FONT:
if (((Font_ *)page[i].obj[j].object)->face)
free(((Font_ *)page[i].obj[j].object)->face);
if (((Font_ *) page[i].obj[j].object)->face)
free(((Font_ *) page[i].obj[j].object)->face);
break;
case P:
break;