1 diff -urN arj-3.10.22/arj_arcv.c arj-3.10.22.ne/arj_arcv.c
2 --- arj-3.10.22/arj_arcv.c 2005-06-21 21:53:12.000000000 +0200
3 +++ arj-3.10.22.ne/arj_arcv.c 2013-01-30 16:34:20.288567626 +0100
6 if(msg_fprintf(idxstream, M_TESTING, archive_name)<0)
8 - if(fprintf(idxstream, lf)<0)
9 + if(fprintf(idxstream, "%s", lf)<0)
12 cmd_verb=ARJ_CMD_TEST;
13 diff -urN arj-3.10.22/arjdisp.c arj-3.10.22.ne/arjdisp.c
14 --- arj-3.10.22/arjdisp.c 2003-06-22 13:12:28.000000000 +0200
15 +++ arj-3.10.22.ne/arjdisp.c 2013-01-30 16:54:51.568563877 +0100
21 + scrprintf("%s", win_top);
24 - gotoxy(2, i); scrprintf(win_border);
25 - gotoxy(79, i); scrprintf(win_border);
26 + gotoxy(2, i); scrprintf("%s", win_border);
27 + gotoxy(79, i); scrprintf("%s", win_border);
29 - gotoxy(2, 24); scrprintf(win_bottom);
30 + gotoxy(2, 24); scrprintf("%s", win_bottom);
32 - scrprintf(M_ARJDISP_COPYRIGHT);
33 + scrprintf("%s", M_ARJDISP_COPYRIGHT);
35 - scrprintf(M_ARJDISP_DISTRIBUTION);
36 + scrprintf("%s", M_ARJDISP_DISTRIBUTION);
38 - scrprintf(M_ARJDISP_LICENSE);
39 + scrprintf("%s", M_ARJDISP_LICENSE);
41 scrprintf(M_PROCESSING_ARCHIVE, archive_name);
42 t=strtok(M_ARJDISP_INFO, msg_lf);
44 t=strtok(NULL, msg_lf);
47 - scrprintf(M_PRESS_ANY_KEY);
48 + scrprintf("%s", M_PRESS_ANY_KEY);
57 + scrprintf("%s", win_top);
60 - gotoxy(2, i); scrprintf(win_border);
61 - gotoxy(79, i); scrprintf(win_border);
62 + gotoxy(2, i); scrprintf("%s", win_border);
63 + gotoxy(79, i); scrprintf("%s", win_border);
65 - gotoxy(2, 24); scrprintf(win_bottom);
66 + gotoxy(2, 24); scrprintf("%s", win_bottom);
68 - scrprintf(M_ARJDISP_COPYRIGHT);
69 + scrprintf("%s", M_ARJDISP_COPYRIGHT);
71 - scrprintf(M_ARJDISP_DISTRIBUTION);
72 + scrprintf("%s", M_ARJDISP_DISTRIBUTION);
74 - scrprintf(M_ARJDISP_LICENSE);
75 + scrprintf("%s", M_ARJDISP_LICENSE);
77 scrprintf(M_PROCESSING_ARCHIVE, archive_name);
84 + scrprintf("%s", ind_top);
86 - scrprintf(ind_middle);
87 + scrprintf("%s", ind_middle);
89 - scrprintf(ind_bottom);
90 + scrprintf("%s", ind_bottom);
92 - scrprintf(M_ARJDISP_CTR_START);
93 + scrprintf("%s", M_ARJDISP_CTR_START);
99 memset(progress, indo, i);
101 - scrprintf(progress);
102 + scrprintf("%s", progress);
104 scrprintf(M_ARJDISP_CTR, calc_percentage(bytes, uncompsize)/10);
106 @@ -165,19 +165,19 @@
110 - scrprintf(win_top);
111 + scrprintf("%s", win_top);
114 - gotoxy(2, i); scrprintf(win_border);
115 - gotoxy(79, i); scrprintf(win_border);
116 + gotoxy(2, i); scrprintf("%s", win_border);
117 + gotoxy(79, i); scrprintf("%s", win_border);
119 - gotoxy(2, 24); scrprintf(win_bottom);
120 + gotoxy(2, 24); scrprintf("%s", win_bottom);
122 - scrprintf(M_ARJDISP_COPYRIGHT);
123 + scrprintf("%s", M_ARJDISP_COPYRIGHT);
125 - scrprintf(M_ARJDISP_DISTRIBUTION);
126 + scrprintf("%s", M_ARJDISP_DISTRIBUTION);
128 - scrprintf(M_ARJDISP_LICENSE);
129 + scrprintf("%s", M_ARJDISP_LICENSE);
131 scrprintf(M_FINISHED_PROCESSING, archive_name);
133 diff -urN arj-3.10.22/arjsfx.c arj-3.10.22.ne/arjsfx.c
134 --- arj-3.10.22/arjsfx.c 2005-06-21 21:53:14.000000000 +0200
135 +++ arj-3.10.22.ne/arjsfx.c 2013-01-30 16:38:12.380643609 +0100
137 freopen(dev_con, m_w, stdout);
138 #if SFX_LEVEL>=ARJSFXV
140 - msg_fprintf(stderr, M_DISK_FULL);
141 + msg_fprintf(stderr, "%s", M_DISK_FULL);
142 if(debug_enabled&&strchr(debug_opt, 't')!=NULL)
144 ticks=get_ticks()-ticks;
145 diff -urN arj-3.10.22/arj_user.c arj-3.10.22.ne/arj_user.c
146 --- arj-3.10.22/arj_user.c 2004-06-18 18:19:36.000000000 +0200
147 +++ arj-3.10.22.ne/arj_user.c 2013-01-30 16:42:56.832435935 +0100
148 @@ -1059,7 +1059,7 @@
149 if(recover_file(tmp_archive_name, nullstr, tmp_tmp_filename, protected, eof_pos))
151 msg_cprintf(H_HL, M_CANT_FIND_DAMAGE, archive_name);
157 @@ -1294,7 +1294,7 @@
158 if(recover_file(archive_name, nullstr, nullstr, protected, eof_pos))
160 msg_cprintf(H_HL, M_CANT_FIND_DAMAGE, archive_name);
166 @@ -2303,7 +2303,7 @@
167 timestamp_to_str(timetext, &ftime_stamp);
168 msg_cprintf(H_HL|H_NFMT, M_ARCHIVE_CREATED, timetext);
169 if(show_ansi_comments)
171 + fputs(cmt_ptr, stdout);
173 display_comment(cmt_ptr);
174 /* The sfx_setup() occurs here */
175 diff -urN arj-3.10.22/rearj.c arj-3.10.22.ne/rearj.c
176 --- arj-3.10.22/rearj.c 2005-06-21 21:53:14.000000000 +0200
177 +++ arj-3.10.22.ne/rearj.c 2013-01-30 16:44:17.368666299 +0100
179 msg_cprintf(H_HL|H_NFMT, M_OLD_SIZE, old_fsize);
180 msg_cprintf(H_HL|H_NFMT, M_NEW_SIZE, new_fsize);
181 msg_cprintf(H_HL|H_NFMT, M_SAVINGS_SIZE, gain);
184 total_old_fsize+=old_fsize;
185 total_new_fsize+=new_fsize;
187 diff -urN arj-3.10.22/register.c arj-3.10.22.ne/register.c
188 --- arj-3.10.22/register.c 2004-04-21 09:04:10.000000000 +0200
189 +++ arj-3.10.22.ne/register.c 2013-01-30 16:46:12.208044161 +0100
191 char reg_source[200];
194 - printf(M_REGISTER_BANNER);
195 + fputs(M_REGISTER_BANNER, stdout);
196 integrity_pattern[0]--;