a1212ad29c
collides with the standard C wprintf() (print a wide character string). Upstream already realised this was a bad idea and changed the function's name to mc_wprintf(). Do the same for our port. ok ajacoutot landry dcoppa
53 lines
2.0 KiB
Plaintext
53 lines
2.0 KiB
Plaintext
$OpenBSD: patch-src_updown_c,v 1.3 2011/04/22 11:21:46 stsp Exp $
|
|
--- src/updown.c.orig Sun Aug 14 22:39:30 2005
|
|
+++ src/updown.c Thu Apr 21 23:48:31 2011
|
|
@@ -40,7 +40,7 @@ static int mcd(char *dir)
|
|
{
|
|
char buf[256];
|
|
char err[50];
|
|
- static char odir[256];
|
|
+ static char odir[PATH_MAX];
|
|
static int init = 0;
|
|
|
|
if (!init) {
|
|
@@ -240,7 +240,7 @@ void updown(int what, int nr)
|
|
do_log("%s", cmdline); /* jl 22.06.97 */
|
|
|
|
if (P_PFULL(g) == 'N') {
|
|
- win = wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
|
|
+ win = wopen(5, 5, 74, 11, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
|
|
snprintf(title, sizeof(title), _("%.30s %s - Press CTRL-C to quit"), P_PNAME(g),
|
|
what == 'U' ? _("upload") : _("download"));
|
|
wtitle(win, TMID, title);
|
|
@@ -355,7 +355,7 @@ void updown(int what, int nr)
|
|
if (win && (status & 0xFF00) == 0) {
|
|
#if VC_MUSIC
|
|
if (P_SOUND[0] == 'Y') {
|
|
- wprintf(win, _("\n READY: press any key to continue..."));
|
|
+ mc_wprintf(win, _("\n READY: press any key to continue..."));
|
|
music();
|
|
} else
|
|
sleep(1);
|
|
@@ -363,7 +363,7 @@ void updown(int what, int nr)
|
|
/* MARK updated 02/17/94 - If there was no VC_MUSIC capability, */
|
|
/* then at least make some beeps! */
|
|
if (P_SOUND[0] == 'Y')
|
|
- wprintf(win, "\007\007\007");
|
|
+ mc_wprintf(win, "\007\007\007");
|
|
sleep(1);
|
|
#endif
|
|
}
|
|
@@ -526,9 +526,9 @@ void runscript(int ask, const char *s, const char *l,
|
|
w = wopen(10, 5, 70, 10, BDOUBLE, stdattr, mfcolor, mbcolor, 0, 0, 1);
|
|
wtitle(w, TMID, _("Run a script"));
|
|
wputs(w, "\n");
|
|
- wprintf(w, "%s %s\n", username, scr_user[0] ? msg : "");
|
|
- wprintf(w, "%s %s\n", password, scr_passwd[0] ? msg : "");
|
|
- wprintf(w, "%s %s\n", name_of_script, scr_name);
|
|
+ mc_wprintf(w, "%s %s\n", username, scr_user[0] ? msg : "");
|
|
+ mc_wprintf(w, "%s %s\n", password, scr_passwd[0] ? msg : "");
|
|
+ mc_wprintf(w, "%s %s\n", name_of_script, scr_name);
|
|
wlocate(w, 4, 5);
|
|
wputs(w, question);
|
|
wredraw(w, 1);
|