Replaced all printf with fprintf(stderr)
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@110 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
ab8517e868
commit
434d9cbe94
56
rdesktop.c
56
rdesktop.c
@ -50,24 +50,24 @@ BOOL grab_keyboard = True;
|
|||||||
static void
|
static void
|
||||||
usage(char *program)
|
usage(char *program)
|
||||||
{
|
{
|
||||||
printf("Usage: %s [options] server\n", program);
|
fprintf(stderr, "Usage: %s [options] server\n", program);
|
||||||
printf(" -u: user name\n");
|
fprintf(stderr, " -u: user name\n");
|
||||||
printf(" -d: domain\n");
|
fprintf(stderr, " -d: domain\n");
|
||||||
printf(" -s: shell\n");
|
fprintf(stderr, " -s: shell\n");
|
||||||
printf(" -c: working directory\n");
|
fprintf(stderr, " -c: working directory\n");
|
||||||
printf(" -p: password (autologon)\n");
|
fprintf(stderr, " -p: password (autologon)\n");
|
||||||
printf(" -P: askpass-program (autologon)\n");
|
fprintf(stderr, " -P: askpass-program (autologon)\n");
|
||||||
printf(" -n: client hostname\n");
|
fprintf(stderr, " -n: client hostname\n");
|
||||||
printf(" -k: keyboard layout on terminal server (us,sv,gr etc.)\n");
|
fprintf(stderr, " -k: keyboard layout on terminal server (us,sv,gr etc.)\n");
|
||||||
printf(" -g: desktop geometry (WxH)\n");
|
fprintf(stderr, " -g: desktop geometry (WxH)\n");
|
||||||
printf(" -f: full-screen mode\n");
|
fprintf(stderr, " -f: full-screen mode\n");
|
||||||
printf(" -b: force bitmap updates\n");
|
fprintf(stderr, " -b: force bitmap updates\n");
|
||||||
printf(" -e: disable encryption (French TS)\n");
|
fprintf(stderr, " -e: disable encryption (French TS)\n");
|
||||||
printf(" -m: do not send motion events\n");
|
fprintf(stderr, " -m: do not send motion events\n");
|
||||||
printf(" -l: do not request licence\n");
|
fprintf(stderr, " -l: do not request licence\n");
|
||||||
printf(" -t: rdp tcp port\n");
|
fprintf(stderr, " -t: rdp tcp port\n");
|
||||||
printf(" -K: keep window manager key bindings\n");
|
fprintf(stderr, " -K: keep window manager key bindings\n");
|
||||||
printf(" -w: window title\n");
|
fprintf(stderr, " -w: window title\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Client program */
|
/* Client program */
|
||||||
@ -85,9 +85,9 @@ main(int argc, char *argv[])
|
|||||||
uint32 flags;
|
uint32 flags;
|
||||||
int c;
|
int c;
|
||||||
|
|
||||||
printf("rdesktop: A Remote Desktop Protocol client.\n");
|
fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n");
|
||||||
printf("Version " VERSION ". Copyright (C) 1999-2001 Matt Chapman.\n");
|
fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2001 Matt Chapman.\n");
|
||||||
printf("See http://www.rdesktop.org/ for more information.\n\n");
|
fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n");
|
||||||
|
|
||||||
flags = RDP_LOGON_NORMAL;
|
flags = RDP_LOGON_NORMAL;
|
||||||
domain[0] = password[0] = shell[0] = directory[0] = 0;
|
domain[0] = password[0] = shell[0] = directory[0] = 0;
|
||||||
@ -258,7 +258,7 @@ main(int argc, char *argv[])
|
|||||||
if (!rdp_connect(server, flags, domain, password, shell, directory))
|
if (!rdp_connect(server, flags, domain, password, shell, directory))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
printf("Connection successful.\n");
|
fprintf(stderr, "Connection successful.\n");
|
||||||
|
|
||||||
if (ui_create_window())
|
if (ui_create_window())
|
||||||
{
|
{
|
||||||
@ -266,7 +266,7 @@ main(int argc, char *argv[])
|
|||||||
ui_destroy_window();
|
ui_destroy_window();
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("Disconnecting...\n");
|
fprintf(stderr, "Disconnecting...\n");
|
||||||
rdp_disconnect();
|
rdp_disconnect();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -369,21 +369,21 @@ hexdump(unsigned char *p, unsigned int len)
|
|||||||
|
|
||||||
while (offset < len)
|
while (offset < len)
|
||||||
{
|
{
|
||||||
printf("%04x ", offset);
|
fprintf(stderr, "%04x ", offset);
|
||||||
thisline = len - offset;
|
thisline = len - offset;
|
||||||
if (thisline > 16)
|
if (thisline > 16)
|
||||||
thisline = 16;
|
thisline = 16;
|
||||||
|
|
||||||
for (i = 0; i < thisline; i++)
|
for (i = 0; i < thisline; i++)
|
||||||
printf("%02x ", line[i]);
|
fprintf(stderr, "%02x ", line[i]);
|
||||||
|
|
||||||
for (; i < 16; i++)
|
for (; i < 16; i++)
|
||||||
printf(" ");
|
fprintf(stderr, " ");
|
||||||
|
|
||||||
for (i = 0; i < thisline; i++)
|
for (i = 0; i < thisline; i++)
|
||||||
printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.');
|
fprintf(stderr, "%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.');
|
||||||
|
|
||||||
printf("\n");
|
fprintf(stderr, "\n");
|
||||||
offset += thisline;
|
offset += thisline;
|
||||||
line += thisline;
|
line += thisline;
|
||||||
}
|
}
|
||||||
|
@ -247,17 +247,17 @@ xkeymap_translate_key(KeySym keysym, unsigned int keycode, unsigned int state)
|
|||||||
return tr;
|
return tr;
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym));
|
fprintf(stderr, "No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym));
|
||||||
|
|
||||||
/* not in keymap, try to interpret the raw scancode */
|
/* not in keymap, try to interpret the raw scancode */
|
||||||
if ((keycode >= min_keycode) && (keycode <= 0x60))
|
if ((keycode >= min_keycode) && (keycode <= 0x60))
|
||||||
{
|
{
|
||||||
tr.scancode = keycode - min_keycode;
|
tr.scancode = keycode - min_keycode;
|
||||||
printf("Sending guessed scancode 0x%x\n", tr.scancode);
|
fprintf(stderr, "Sending guessed scancode 0x%x\n", tr.scancode);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
printf("No good guess for keycode 0x%x found\n", keycode);
|
fprintf(stderr, "No good guess for keycode 0x%x found\n", keycode);
|
||||||
}
|
}
|
||||||
|
|
||||||
return tr;
|
return tr;
|
||||||
|
Loading…
Reference in New Issue
Block a user