/* Replay a remote debug session logfile for GDB.
Copyright (C) 1996, 1998, 1999, 2000, 2002, 2003, 2005, 2006, 2007, 2008,
- 2009 Free Software Foundation, Inc.
+ 2009, 2010 Free Software Foundation, Inc.
Written by Fred Fish (fnf@cygnus.com) from pieces of gdbserver.
This file is part of GDB.
#endif
#if USE_WIN32API
-#include <winsock.h>
+#include <winsock2.h>
#endif
#ifndef HAVE_SOCKLEN_T
Then return to command level. */
static void
-perror_with_name (char *string)
+perror_with_name (const char *string)
{
#ifndef STDC_HEADERS
extern int errno;
exit (1);
}
+static void
+remote_error (const char *desc)
+{
+ fprintf (stderr, "\n%s\n", desc);
+ fflush (stderr);
+ exit (1);
+}
+
static void
remote_close (void)
{
#endif
tmp_desc = socket (PF_INET, SOCK_STREAM, 0);
- if (tmp_desc < 0)
+ if (tmp_desc == -1)
perror_with_name ("Can't open socket");
/* Allow rapid reuse of this port. */
setsockopt (tmp_desc, SOL_SOCKET, SO_KEEPALIVE, (char *) &tmp, sizeof (tmp));
/* Tell TCP not to delay small packets. This greatly speeds up
- interactive response. */
+ interactive response. */
tmp = 1;
setsockopt (remote_desc, IPPROTO_TCP, TCP_NODELAY,
(char *) &tmp, sizeof (tmp));
return (ch);
}
+static int
+gdbchar (int desc)
+{
+ unsigned char fromgdb;
+
+ if (read (desc, &fromgdb, 1) != 1)
+ return -1;
+ else
+ return fromgdb;
+}
+
/* Accept input from gdb and match with chars from fp (after skipping one
blank) up until a \n is read from fp (which is not matched) */
expect (FILE *fp)
{
int fromlog;
- unsigned char fromgdb;
+ int fromgdb;
if ((fromlog = logchar (fp)) != ' ')
{
{
fromlog = logchar (fp);
if (fromlog == EOL)
- {
- break;
- }
- read (remote_desc, &fromgdb, 1);
+ break;
+ fromgdb = gdbchar (remote_desc);
+ if (fromgdb < 0)
+ remote_error ("Error during read from gdb");
}
while (fromlog == fromgdb);
+
if (fromlog != EOL)
{
- sync_error (fp, "Sync error during read of gdb packet", fromlog,
+ sync_error (fp, "Sync error during read of gdb packet from log", fromlog,
fromgdb);
}
}
while ((fromlog = logchar (fp)) != EOL)
{
ch = fromlog;
- write (remote_desc, &ch, 1);
+ if (write (remote_desc, &ch, 1) != 1)
+ remote_error ("Error during write to gdb");
}
}
gdbreplay_version (void)
{
printf ("GNU gdbreplay %s%s\n"
- "Copyright (C) 2008 Free Software Foundation, Inc.\n"
+ "Copyright (C) 2010 Free Software Foundation, Inc.\n"
"gdbreplay is free software, covered by the GNU General Public License.\n"
"This gdbreplay was configured as \"%s\"\n",
PKGVERSION, version, host_name);