Fix build

chris-y · chris-y · commit a8164c2d639e · 2026-07-04T12:20:39.000+01:00
diff --git a/src/progress.c b/src/progress.c
@@ -147,18 +147,19 @@ void progress_set_scanning(struct Window *win, void *gauge, void *frame, ULONG t
 #endif
 }
 
-void progress_set_adding(struct Window *win, void *gauge, void *frame, const char *filename)
+void progress_set_adding(struct Window *win, void *gauge, void *frame, const char *filename, ULONG w, ULONG h)
 {
 	snprintf(progress_msg, PROGRESS_MSG_SIZE, locale_get_string(MSG_ADDING), filename);
 
 #ifdef __amigaos4__
 	struct TextExtent te;
+	char *fn = filename;
 
 	ULONG chars = TextFit(win->RPort, progress_msg, strlen(progress_msg), &te, NULL, 1, w, h);
 
 	if(chars < strlen(progress_msg)) {
 		fn = FilePart(fn);
-		snprintf(progress_msg, chars, locale_get_string(MSG_ADDING), filename);
+		snprintf(progress_msg, chars, locale_get_string(MSG_ADDING), fn);
 	}
 
 	SetGadgetAttrs(frame,
diff --git a/src/progress.h b/src/progress.h
@@ -22,7 +22,7 @@ void progress_set_archive_level(struct Window *win, void *gauge, void *frame, UL
 void progress_set_scanning(struct Window *win, void *gauge, void *frame, ULONG total);
 
 /* Set progress bar adding status */
-void progress_set_adding(struct Window *win, void *gauge, void *frame, const char *filename);
+void progress_set_adding(struct Window *win, void *gauge, void *frame, const char *filename, ULONG w, ULONG h);
 
 /* Set progress bar number of selected items */
 void progress_set_selected(struct Window *win, void *gauge, void *frame, ULONG selected, ULONG total);
diff --git a/src/win.c b/src/win.c
@@ -2684,7 +2684,7 @@ BOOL window_edit_add(void *awin, char *file, char *root)
 	struct avalanche_window *aw = (struct avalanche_window *)awin;
 	
 	if(module_vscan(awin, file, NULL, 0, FALSE) == 0) {
-		progress_set_adding(aw->windows[WID_MAIN], aw->gadgets[GID_PROGRESS], aw->gadgets[GID_PROGRESSFR], file);
+		progress_set_adding(aw->windows[WID_MAIN], aw->gadgets[GID_PROGRESS], aw->gadgets[GID_PROGRESSFR], file, P_WIDTH, P_HEIGHT);
 		module_free(aw->tab_node);
 		return module_add(aw, aw->tab_node, file, tab_get_current_dir(aw->tab_node), root);
 	}
diff --git a/src/xad.c b/src/xad.c
@@ -485,7 +485,7 @@ long xad_info(const char *file, struct avalanche_config *config, void *awin, str
 			return XADERR_BREAK;
 		}
 
-		if((xu->arctype == XNONE) && ((ai->xai_Flags & XADAIF_CRYPTED) || (err == XADERR_PASSWORD)) {
+		if((xu->arctype == XNONE) && ((ai->xai_Flags & XADAIF_CRYPTED) || (err == XADERR_PASSWORD))) {
 			xu->pw = AllocVec(100, MEMF_CLEAR);
 			err = ask_password(awin, xu->pw, 100);
 			if(err == 0) {

Original file line number	Diff line number	Diff line change
`@@ -147,18 +147,19 @@ void progress_set_scanning(struct Window win, void gauge, void *frame, ULONG t`
`147`	`147`	`#endif`
`148`	`148`	`}`
`149`	`149`
`150`		`-void progress_set_adding(struct Window win, void gauge, void frame, const char filename)`
	`150`	`+void progress_set_adding(struct Window win, void gauge, void frame, const char filename, ULONG w, ULONG h)`
`151`	`151`	`{`
`152`	`152`	`snprintf(progress_msg, PROGRESS_MSG_SIZE, locale_get_string(MSG_ADDING), filename);`
`153`	`153`
`154`	`154`	`#ifdef __amigaos4__`
`155`	`155`	`struct TextExtent te;`
	`156`	`+ char *fn = filename;`
`156`	`157`
`157`	`158`	`ULONG chars = TextFit(win->RPort, progress_msg, strlen(progress_msg), &te, NULL, 1, w, h);`
`158`	`159`
`159`	`160`	`if(chars < strlen(progress_msg)) {`
`160`	`161`	`fn = FilePart(fn);`
`161`		`- snprintf(progress_msg, chars, locale_get_string(MSG_ADDING), filename);`
	`162`	`+ snprintf(progress_msg, chars, locale_get_string(MSG_ADDING), fn);`
`162`	`163`	`}`
`163`	`164`
`164`	`165`	`SetGadgetAttrs(frame,`
Original file line number	Diff line number	Diff line change
`@@ -2684,7 +2684,7 @@ BOOL window_edit_add(void awin, char file, char *root)`
`2684`	`2684`	`struct avalanche_window aw = (struct avalanche_window )awin;`
`2685`	`2685`
`2686`	`2686`	`if(module_vscan(awin, file, NULL, 0, FALSE) == 0) {`
`2687`		`- progress_set_adding(aw->windows[WID_MAIN], aw->gadgets[GID_PROGRESS], aw->gadgets[GID_PROGRESSFR], file);`
	`2687`	`+ progress_set_adding(aw->windows[WID_MAIN], aw->gadgets[GID_PROGRESS], aw->gadgets[GID_PROGRESSFR], file, P_WIDTH, P_HEIGHT);`
`2688`	`2688`	`module_free(aw->tab_node);`
`2689`	`2689`	`return module_add(aw, aw->tab_node, file, tab_get_current_dir(aw->tab_node), root);`
`2690`	`2690`	`}`
Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ long xad_info(const char file, struct avalanche_config config, void *awin, str`
`485`	`485`	`return XADERR_BREAK;`
`486`	`486`	`}`
`487`	`487`
`488`		`- if((xu->arctype == XNONE) && ((ai->xai_Flags & XADAIF_CRYPTED) \|\| (err == XADERR_PASSWORD)) {`
	`488`	`+ if((xu->arctype == XNONE) && ((ai->xai_Flags & XADAIF_CRYPTED) \|\| (err == XADERR_PASSWORD))) {`
`489`	`489`	`xu->pw = AllocVec(100, MEMF_CLEAR);`
`490`	`490`	`err = ask_password(awin, xu->pw, 100);`
`491`	`491`	`if(err == 0) {`