CVS: rdesktop disk.c,1.45,1.46 orders.c,1.47,1.48 parallel.c,1.13,1.14 printer.c,1.14,1.15 printercache.c,1.8,1.9 rdp.c,1.83,1.84 rdpdr.c,1.39,1.40 rdpsnd_sgi.c,1.3,1.4 serial.c,1.27,1.28
Michael Gernoth <[email protected]>
| Newsgroups | gmane.network.rdesktop.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32287
Modified Files:
disk.c orders.c parallel.c printer.c printercache.c rdp.c
rdpdr.c rdpsnd_sgi.c serial.c
Log Message:
remove C++-style comments
Index: disk.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/disk.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** disk.c 8 Mar 2005 01:01:46 -0000 1.45
--- disk.c 15 Mar 2005 11:25:49 -0000 1.46
***************
*** 261,265 ****
int count = 0;
! // skip the first colon
optarg++;
while ((pos = next_arg(optarg, ',')) && *id < RDPDR_MAX_DEVICES)
--- 261,265 ----
int count = 0;
! /* skip the first colon */
optarg++;
while ((pos = next_arg(optarg, ',')) && *id < RDPDR_MAX_DEVICES)
***************
*** 307,311 ****
case CREATE_ALWAYS:
! // Delete existing file/link.
unlink(path);
flags |= O_CREAT;
--- 307,311 ----
case CREATE_ALWAYS:
! /* Delete existing file/link. */
unlink(path);
flags |= O_CREAT;
***************
*** 314,318 ****
case CREATE_NEW:
! // If the file already exists, then fail.
flags |= O_CREAT | O_EXCL;
break;
--- 314,318 ----
case CREATE_NEW:
! /* If the file already exists, then fail. */
flags |= O_CREAT | O_EXCL;
break;
***************
*** 320,324 ****
case OPEN_ALWAYS:
! // Create if not already exists.
flags |= O_CREAT;
break;
--- 320,324 ----
case OPEN_ALWAYS:
! /* Create if not already exists. */
flags |= O_CREAT;
break;
***************
*** 326,342 ****
case OPEN_EXISTING:
! // Default behaviour
break;
case TRUNCATE_EXISTING:
! // If the file does not exist, then fail.
flags |= O_TRUNC;
break;
}
! //printf("Open: \"%s\" flags: %X, accessmask: %X sharemode: %X create disp: %X\n", path, flags_and_attributes, accessmask, sharemode, create_disposition);
! // Get information about file and set that flag ourselfs
if ((stat(path, &filestat) == 0) && (S_ISDIR(filestat.st_mode)))
{
--- 326,342 ----
case OPEN_EXISTING:
! /* Default behaviour */
break;
case TRUNCATE_EXISTING:
! /* If the file does not exist, then fail. */
flags |= O_TRUNC;
break;
}
! /*printf("Open: \"%s\" flags: %X, accessmask: %X sharemode: %X create disp: %X\n", path, flags_and_attributes, accessmask, sharemode, create_disposition);*/
! /* Get information about file and set that flag ourselfs */
if ((stat(path, &filestat) == 0) && (S_ISDIR(filestat.st_mode)))
{
***************
*** 569,573 ****
path = g_fileinfo[handle].path;
! // Get information about file
if (fstat(handle, &filestat) != 0)
{
--- 569,573 ----
path = g_fileinfo[handle].path;
! /* Get information about file */
if (fstat(handle, &filestat) != 0)
{
***************
*** 577,581 ****
}
! // Set file attributes
file_attributes = 0;
if (S_ISDIR(filestat.st_mode))
--- 577,581 ----
}
! /* Set file attributes */
file_attributes = 0;
if (S_ISDIR(filestat.st_mode))
***************
*** 592,596 ****
file_attributes |= FILE_ATTRIBUTE_READONLY;
! // Return requested data
switch (info_class)
{
--- 592,596 ----
file_attributes |= FILE_ATTRIBUTE_READONLY;
! /* Return requested data */
switch (info_class)
{
***************
*** 598,614 ****
seconds_since_1970_to_filetime(get_create_time(&filestat), &ft_high,
&ft_low);
! out_uint32_le(out, ft_low); //create_access_time
out_uint32_le(out, ft_high);
seconds_since_1970_to_filetime(filestat.st_atime, &ft_high, &ft_low);
! out_uint32_le(out, ft_low); //last_access_time
out_uint32_le(out, ft_high);
seconds_since_1970_to_filetime(filestat.st_mtime, &ft_high, &ft_low);
! out_uint32_le(out, ft_low); //last_write_time
out_uint32_le(out, ft_high);
seconds_since_1970_to_filetime(filestat.st_ctime, &ft_high, &ft_low);
! out_uint32_le(out, ft_low); //last_change_time
out_uint32_le(out, ft_high);
--- 598,614 ----
seconds_since_1970_to_filetime(get_create_time(&filestat), &ft_high,
&ft_low);
! out_uint32_le(out, ft_low); /* create_access_time */
out_uint32_le(out, ft_high);
seconds_since_1970_to_filetime(filestat.st_atime, &ft_high, &ft_low);
! out_uint32_le(out, ft_low); /* last_access_time */
out_uint32_le(out, ft_high);
seconds_since_1970_to_filetime(filestat.st_mtime, &ft_high, &ft_low);
! out_uint32_le(out, ft_low); /* last_write_time */
out_uint32_le(out, ft_high);
seconds_since_1970_to_filetime(filestat.st_ctime, &ft_high, &ft_low);
! out_uint32_le(out, ft_low); /* last_change_time */
out_uint32_le(out, ft_high);
***************
*** 618,628 ****
case FileStandardInformation:
! out_uint32_le(out, filestat.st_size); //Allocation size
out_uint32_le(out, 0);
! out_uint32_le(out, filestat.st_size); //End of file
out_uint32_le(out, 0);
! out_uint32_le(out, filestat.st_nlink); //Number of links
! out_uint8(out, 0); //Delete pending
! out_uint8(out, S_ISDIR(filestat.st_mode) ? 1 : 0); //Directory
break;
--- 618,628 ----
case FileStandardInformation:
! out_uint32_le(out, filestat.st_size); /* Allocation size */
out_uint32_le(out, 0);
! out_uint32_le(out, filestat.st_size); /* End of file */
out_uint32_le(out, 0);
! out_uint32_le(out, filestat.st_nlink); /* Number of links */
! out_uint8(out, 0); /* Delete pending */
! out_uint8(out, S_ISDIR(filestat.st_mode) ? 1 : 0); /* Directory */
break;
***************
*** 664,672 ****
in_uint8s(in, 24); /* unknown */
! // CreationTime
in_uint32_le(in, ft_low);
in_uint32_le(in, ft_high);
! // AccessTime
in_uint32_le(in, ft_low);
in_uint32_le(in, ft_high);
--- 664,672 ----
in_uint8s(in, 24); /* unknown */
! /* CreationTime */
in_uint32_le(in, ft_low);
in_uint32_le(in, ft_high);
! /* AccessTime */
in_uint32_le(in, ft_low);
in_uint32_le(in, ft_high);
***************
*** 674,678 ****
access_time = convert_1970_to_filetime(ft_high, ft_low);
! // WriteTime
in_uint32_le(in, ft_low);
in_uint32_le(in, ft_high);
--- 674,678 ----
access_time = convert_1970_to_filetime(ft_high, ft_low);
! /* WriteTime */
in_uint32_le(in, ft_low);
in_uint32_le(in, ft_high);
***************
*** 680,684 ****
write_time = convert_1970_to_filetime(ft_high, ft_low);
! // ChangeTime
in_uint32_le(in, ft_low);
in_uint32_le(in, ft_high);
--- 680,684 ----
write_time = convert_1970_to_filetime(ft_high, ft_low);
! /* ChangeTime */
in_uint32_le(in, ft_low);
in_uint32_le(in, ft_high);
***************
*** 719,723 ****
if (!file_attributes)
! break; // not valid
mode = filestat.st_mode;
--- 719,723 ----
if (!file_attributes)
! break; /* not valid */
mode = filestat.st_mode;
***************
*** 836,840 ****
if (memcmp(&pfinfo->notify, ¬ify, sizeof(NOTIFY)))
{
! //printf("disk_check_notify found changed event\n");
memcpy(&pfinfo->notify, ¬ify, sizeof(NOTIFY));
status = STATUS_NOTIFY_ENUM_DIR;
--- 836,840 ----
if (memcmp(&pfinfo->notify, ¬ify, sizeof(NOTIFY)))
{
! /*printf("disk_check_notify found changed event\n");*/
memcpy(&pfinfo->notify, ¬ify, sizeof(NOTIFY));
status = STATUS_NOTIFY_ENUM_DIR;
***************
*** 971,975 ****
strncpy(info.label, buf + 41, 32);
info.label[32] = '\0';
! //info.Serial = (buf[128]<<24)+(buf[127]<<16)+(buf[126]<<8)+buf[125];
}
close(fd);
--- 971,975 ----
strncpy(info.label, buf + 41, 32);
info.label[32] = '\0';
! /* info.Serial = (buf[128]<<24)+(buf[127]<<16)+(buf[126]<<8)+buf[125]; */
}
close(fd);
***************
*** 1074,1078 ****
case FileBothDirectoryInformation:
! // If a search pattern is received, remember this pattern, and restart search
if (pattern[0] != 0)
{
--- 1074,1078 ----
case FileBothDirectoryInformation:
! /* If a search pattern is received, remember this pattern, and restart search */
if (pattern[0] != 0)
{
***************
*** 1081,1085 ****
}
! // find next dirent matching pattern
pdirent = readdir(pdir);
while (pdirent && fnmatch(pfinfo->pattern, pdirent->d_name, 0) != 0)
--- 1081,1085 ----
}
! /* find next dirent matching pattern */
pdirent = readdir(pdir);
while (pdirent && fnmatch(pfinfo->pattern, pdirent->d_name, 0) != 0)
***************
*** 1089,1093 ****
return STATUS_NO_MORE_FILES;
! // Get information for directory entry
sprintf(fullpath, "%s/%s", dirname, pdirent->d_name);
--- 1089,1093 ----
return STATUS_NO_MORE_FILES;
! /* Get information for directory entry */
sprintf(fullpath, "%s/%s", dirname, pdirent->d_name);
***************
*** 1120,1151 ****
file_attributes |= FILE_ATTRIBUTE_READONLY;
! // Return requested information
! out_uint8s(out, 8); //unknown zero
seconds_since_1970_to_filetime(get_create_time(&fstat), &ft_high, &ft_low);
! out_uint32_le(out, ft_low); // create time
out_uint32_le(out, ft_high);
seconds_since_1970_to_filetime(fstat.st_atime, &ft_high, &ft_low);
! out_uint32_le(out, ft_low); //last_access_time
out_uint32_le(out, ft_high);
seconds_since_1970_to_filetime(fstat.st_mtime, &ft_high, &ft_low);
! out_uint32_le(out, ft_low); //last_write_time
out_uint32_le(out, ft_high);
seconds_since_1970_to_filetime(fstat.st_ctime, &ft_high, &ft_low);
! out_uint32_le(out, ft_low); //change_write_time
out_uint32_le(out, ft_high);
! out_uint32_le(out, fstat.st_size); //filesize low
! out_uint32_le(out, 0); //filesize high
! out_uint32_le(out, fstat.st_size); //filesize low
! out_uint32_le(out, 0); //filesize high
out_uint32_le(out, file_attributes);
! out_uint8(out, 2 * strlen(pdirent->d_name) + 2); //unicode length
! out_uint8s(out, 7); //pad?
! out_uint8(out, 0); //8.3 file length
! out_uint8s(out, 2 * 12); //8.3 unicode length
rdp_out_unistr(out, pdirent->d_name, 2 * strlen(pdirent->d_name));
break;
--- 1120,1151 ----
file_attributes |= FILE_ATTRIBUTE_READONLY;
! /* Return requested information */
! out_uint8s(out, 8); /* unknown zero */
seconds_since_1970_to_filetime(get_create_time(&fstat), &ft_high, &ft_low);
! out_uint32_le(out, ft_low); /* create time */
out_uint32_le(out, ft_high);
seconds_since_1970_to_filetime(fstat.st_atime, &ft_high, &ft_low);
! out_uint32_le(out, ft_low); /* last_access_time */
out_uint32_le(out, ft_high);
seconds_since_1970_to_filetime(fstat.st_mtime, &ft_high, &ft_low);
! out_uint32_le(out, ft_low); /* last_write_time */
out_uint32_le(out, ft_high);
seconds_since_1970_to_filetime(fstat.st_ctime, &ft_high, &ft_low);
! out_uint32_le(out, ft_low); /* change_write_time */
out_uint32_le(out, ft_high);
! out_uint32_le(out, fstat.st_size); /* filesize low */
! out_uint32_le(out, 0); /* filesize high */
! out_uint32_le(out, fstat.st_size); /* filesize low */
! out_uint32_le(out, 0); /* filesize high */
out_uint32_le(out, file_attributes);
! out_uint8(out, 2 * strlen(pdirent->d_name) + 2); /* unicode length */
! out_uint8s(out, 7); /* pad? */
! out_uint8(out, 0); /* 8.3 file length */
! out_uint8s(out, 2 * 12); /* 8.3 unicode length */
rdp_out_unistr(out, pdirent->d_name, 2 * strlen(pdirent->d_name));
break;
***************
*** 1179,1184 ****
switch (request)
{
! case 25: // ?
! case 42: // ?
default:
unimpl("DISK IOCTL %d\n", request);
--- 1179,1184 ----
switch (request)
{
! case 25: /* ? */
! case 42: /* ? */
default:
unimpl("DISK IOCTL %d\n", request);
Index: orders.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/orders.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** orders.c 11 Mar 2005 00:50:19 -0000 1.47
--- orders.c 15 Mar 2005 11:25:49 -0000 1.48
***************
*** 936,940 ****
in_uint16_le(s, pad2); /* pad */
in_uint16_le(s, size);
! /* in_uint8s(s, 4); *//* row_size, final_size */
in_uint16_le(s, row_size);
in_uint16_le(s, final_size);
--- 936,940 ----
in_uint16_le(s, pad2); /* pad */
in_uint16_le(s, size);
! /* in_uint8s(s, 4); */ /* row_size, final_size */
in_uint16_le(s, row_size);
in_uint16_le(s, final_size);
Index: parallel.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/parallel.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** parallel.c 8 Mar 2005 01:01:47 -0000 1.13
--- parallel.c 15 Mar 2005 11:25:49 -0000 1.14
***************
*** 33,37 ****
int count = 0;
! // skip the first colon
optarg++;
while ((pos = next_arg(optarg, ',')) && *id < RDPDR_MAX_DEVICES)
--- 33,37 ----
int count = 0;
! /* skip the first colon */
optarg++;
while ((pos = next_arg(optarg, ',')) && *id < RDPDR_MAX_DEVICES)
***************
*** 48,52 ****
printf("PARALLEL %s to %s\n", optarg, pos2);
! // set device type
g_rdpdr_device[*id].device_type = DEVICE_TYPE_PARALLEL;
g_rdpdr_device[*id].pdevice_data = (void *) ppar_info;
--- 48,52 ----
printf("PARALLEL %s to %s\n", optarg, pos2);
! /* set device type */
g_rdpdr_device[*id].device_type = DEVICE_TYPE_PARALLEL;
g_rdpdr_device[*id].pdevice_data = (void *) ppar_info;
Index: printer.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/printer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** printer.c 2 Oct 2004 01:30:32 -0000 1.14
--- printer.c 15 Mar 2005 11:25:49 -0000 1.15
***************
*** 26,31 ****
int already = 0;
! // we need to know how many printers we've already set up
! // supplied from other -r flags than this one.
while (count < *id)
{
--- 26,31 ----
int already = 0;
! /* we need to know how many printers we've already set up
! supplied from other -r flags than this one. */
while (count < *id)
{
Index: printercache.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/printercache.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** printercache.c 6 Mar 2005 21:11:17 -0000 1.8
--- printercache.c 15 Mar 2005 11:25:49 -0000 1.9
***************
*** 240,246 ****
case 4: /* rename item */
in_uint8(s, printer_length);
! in_uint8s(s, 0x3); // padding
in_uint8(s, driver_length);
! in_uint8s(s, 0x3); // padding
/* NOTE - 'driver' doesn't contain driver, it contains the new printer name */
--- 240,246 ----
case 4: /* rename item */
in_uint8(s, printer_length);
! in_uint8s(s, 0x3); /* padding */
in_uint8(s, driver_length);
! in_uint8s(s, 0x3); /* padding */
/* NOTE - 'driver' doesn't contain driver, it contains the new printer name */
***************
*** 254,258 ****
case 3: /* delete item */
in_uint8(s, printer_unicode_length);
! in_uint8s(s, 0x3); // padding
printer_length = rdp_in_unistr(s, printer, printer_unicode_length);
printercache_unlink_blob(printer);
--- 254,258 ----
case 3: /* delete item */
in_uint8(s, printer_unicode_length);
! in_uint8s(s, 0x3); /* padding */
printer_length = rdp_in_unistr(s, printer, printer_unicode_length);
printercache_unlink_blob(printer);
***************
*** 271,284 ****
case 1: /* save device data */
! in_uint8a(s, device_name, 5); // get LPTx/COMx name
! // need to fetch this data so that we can get the length of the packet to store.
! in_uint8s(s, 0x2); // ???
! in_uint8s(s, 0x2) // pad??
in_uint32_be(s, driver_length);
in_uint32_be(s, printer_length);
! in_uint8s(s, 0x7) // pad??
! // next is driver in unicode
! // next is printer in unicode
/* TODO: figure out how to use this information when reconnecting */
/* actually - all we need to store is the driver and printer */
--- 271,284 ----
case 1: /* save device data */
! in_uint8a(s, device_name, 5); /* get LPTx/COMx name */
! /* need to fetch this data so that we can get the length of the packet to store. */
! in_uint8s(s, 0x2); /* ??? */
! in_uint8s(s, 0x2) /* pad?? */
in_uint32_be(s, driver_length);
in_uint32_be(s, printer_length);
! in_uint8s(s, 0x7) /* pad?? */
! /* next is driver in unicode */
! /* next is printer in unicode */
/* TODO: figure out how to use this information when reconnecting */
/* actually - all we need to store is the driver and printer */
***************
*** 286,290 ****
/* rewind stream so that we can save this blob */
/* length is driver_length + printer_length + 19 */
! // rewind stream
s->p = s->p - 19;
--- 286,290 ----
/* rewind stream so that we can save this blob */
/* length is driver_length + printer_length + 19 */
! /* rewind stream */
s->p = s->p - 19;
Index: rdp.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdp.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** rdp.c 14 Mar 2005 18:02:24 -0000 1.83
--- rdp.c 15 Mar 2005 11:25:49 -0000 1.84
***************
*** 1204,1208 ****
error("error while decompressing packet\n");
! //len -= 18;
/* allocate memory and copy the uncompressed data into the temporary stream */
--- 1204,1208 ----
error("error while decompressing packet\n");
! /* len -= 18; */
/* allocate memory and copy the uncompressed data into the temporary stream */
Index: rdpdr.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpdr.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** rdpdr.c 6 Mar 2005 21:11:17 -0000 1.39
--- rdpdr.c 15 Mar 2005 11:25:49 -0000 1.40
***************
*** 156,160 ****
while (iorq->fd != 0)
{
! // create new element if needed
if (iorq->next == NULL)
{
--- 156,160 ----
while (iorq->fd != 0)
{
! /* create new element if needed */
if (iorq->next == NULL)
{
***************
*** 229,233 ****
PRINTER *printerinfo;
! size = 8; //static announce size
size += g_num_devices * 0x14;
--- 229,233 ----
PRINTER *printerinfo;
! size = 8; /* static announce size */
size += g_num_devices * 0x14;
***************
*** 328,332 ****
#ifdef WITH_DEBUG_RDP5
printf("--> rdpdr_send_completion\n");
! //hexdump(s->channel_hdr + 8, s->end - s->channel_hdr - 8);
#endif
channel_send(s, rdpdr_channel);
--- 328,332 ----
#ifdef WITH_DEBUG_RDP5
printf("--> rdpdr_send_completion\n");
! /* hexdump(s->channel_hdr + 8, s->end - s->channel_hdr - 8); */
#endif
channel_send(s, rdpdr_channel);
***************
*** 407,411 ****
in_uint32_be(s, desired_access);
! in_uint8s(s, 0x08); // unknown
in_uint32_le(s, error_mode);
in_uint32_le(s, share_mode);
--- 407,411 ----
in_uint32_be(s, desired_access);
! in_uint8s(s, 0x08); /* unknown */
in_uint32_le(s, error_mode);
in_uint32_le(s, share_mode);
***************
*** 464,468 ****
}
! if (rw_blocking) // Complete read immediately
{
buffer = (uint8 *) xrealloc((void *) buffer, length);
--- 464,468 ----
}
! if (rw_blocking) /* Complete read immediately */
{
buffer = (uint8 *) xrealloc((void *) buffer, length);
***************
*** 477,481 ****
}
! // Add request to table
pst_buf = (uint8 *) xmalloc(length);
if (!pst_buf)
--- 477,481 ----
}
! /* Add request to table */
pst_buf = (uint8 *) xmalloc(length);
if (!pst_buf)
***************
*** 517,521 ****
}
! if (rw_blocking) // Complete immediately
{
status = fns->write(file, s->p, length, offset, &result);
--- 517,521 ----
}
! if (rw_blocking) /* Complete immediately */
{
status = fns->write(file, s->p, length, offset, &result);
***************
*** 523,527 ****
}
! // Add to table
pst_buf = (uint8 *) xmalloc(length);
if (!pst_buf)
--- 523,527 ----
}
! /* Add to table */
pst_buf = (uint8 *) xmalloc(length);
if (!pst_buf)
***************
*** 630,634 ****
unimpl("IRP major=0x%x minor=0x%x: IRP_MN_NOTIFY_CHANGE_DIRECTORY\n", major, minor); */
! in_uint32_le(s, info_level); // notify mask
g_notify_stamp = True;
--- 630,634 ----
unimpl("IRP major=0x%x minor=0x%x: IRP_MN_NOTIFY_CHANGE_DIRECTORY\n", major, minor); */
! in_uint32_le(s, info_level); /* notify mask */
g_notify_stamp = True;
***************
*** 836,840 ****
rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * timeout)
{
! uint32 select_timeout = 0; // Timeout value to be used for select() (in millisecons).
struct async_iorequest *iorq;
char c;
--- 836,840 ----
rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * timeout)
{
! uint32 select_timeout = 0; /* Timeout value to be used for select() (in millisecons). */
struct async_iorequest *iorq;
char c;
***************
*** 921,925 ****
else
{
! // Even if NULL
g_iorequest = iorq->next;
xfree(iorq);
--- 921,925 ----
else
{
! /* Even if NULL */
g_iorequest = iorq->next;
xfree(iorq);
***************
*** 960,964 ****
/* iv_timeout between 2 chars, send partial_len */
! //printf("RDPDR: IVT total %u bytes read of %u\n", iorq->partial_len, iorq->length);
rdpdr_send_completion(iorq->device,
iorq->id, STATUS_SUCCESS,
--- 960,964 ----
/* iv_timeout between 2 chars, send partial_len */
! /*printf("RDPDR: IVT total %u bytes read of %u\n", iorq->partial_len, iorq->length);*/
rdpdr_send_completion(iorq->device,
iorq->id, STATUS_SUCCESS,
***************
*** 1181,1186 ****
while (iorq != NULL)
{
! // Only remove from table when major is not set, or when correct major is supplied.
! // Abort read should not abort a write io request.
if ((iorq->fd == fd) && (major == 0 || iorq->major == major))
{
--- 1181,1186 ----
while (iorq != NULL)
{
! /* Only remove from table when major is not set, or when correct major is supplied.
! Abort read should not abort a write io request. */
if ((iorq->fd == fd) && (major == 0 || iorq->major == major))
{
Index: rdpsnd_sgi.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_sgi.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rdpsnd_sgi.c 15 Oct 2004 18:04:16 -0000 1.3
--- rdpsnd_sgi.c 15 Mar 2005 11:25:50 -0000 1.4
***************
*** 325,331 ****
if (len > gf)
{
! //len = gf * combinedFrameSize;
#if (defined(IRIX_DEBUG))
! //fprintf(stderr,"Fillable...\n");
#endif
}
--- 325,331 ----
if (len > gf)
{
! /* len = gf * combinedFrameSize; */
#if (defined(IRIX_DEBUG))
! /* fprintf(stderr,"Fillable...\n"); */
#endif
}
***************
*** 354,358 ****
{
#if (defined(IRIX_DEBUG))
! //fprintf(stderr,"Busy playing...\n");
#endif
g_dsp_busy = True;
--- 354,358 ----
{
#if (defined(IRIX_DEBUG))
! /* fprintf(stderr,"Busy playing...\n"); */
#endif
g_dsp_busy = True;
Index: serial.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/serial.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** serial.c 20 Feb 2005 19:38:34 -0000 1.27
--- serial.c 15 Mar 2005 11:25:50 -0000 1.28
***************
*** 78,94 ****
/* SERIAL_WAIT_ON_MASK */
! #define SERIAL_EV_RXCHAR 0x0001 // Any Character received
! #define SERIAL_EV_RXFLAG 0x0002 // Received certain character
! #define SERIAL_EV_TXEMPTY 0x0004 // Transmitt Queue Empty
! #define SERIAL_EV_CTS 0x0008 // CTS changed state
! #define SERIAL_EV_DSR 0x0010 // DSR changed state
! #define SERIAL_EV_RLSD 0x0020 // RLSD changed state
! #define SERIAL_EV_BREAK 0x0040 // BREAK received
! #define SERIAL_EV_ERR 0x0080 // Line status error occurred
! #define SERIAL_EV_RING 0x0100 // Ring signal detected
! #define SERIAL_EV_PERR 0x0200 // Printer error occured
! #define SERIAL_EV_RX80FULL 0x0400 // Receive buffer is 80 percent full
! #define SERIAL_EV_EVENT1 0x0800 // Provider specific event 1
! #define SERIAL_EV_EVENT2 0x1000 // Provider specific event 2
/* Modem Status */
--- 78,94 ----
/* SERIAL_WAIT_ON_MASK */
! #define SERIAL_EV_RXCHAR 0x0001 /* Any Character received */
! #define SERIAL_EV_RXFLAG 0x0002 /* Received certain character */
! #define SERIAL_EV_TXEMPTY 0x0004 /* Transmitt Queue Empty */
! #define SERIAL_EV_CTS 0x0008 /* CTS changed state */
! #define SERIAL_EV_DSR 0x0010 /* DSR changed state */
! #define SERIAL_EV_RLSD 0x0020 /* RLSD changed state */
! #define SERIAL_EV_BREAK 0x0040 /* BREAK received */
! #define SERIAL_EV_ERR 0x0080 /* Line status error occurred */
! #define SERIAL_EV_RING 0x0100 /* Ring signal detected */
! #define SERIAL_EV_PERR 0x0200 /* Printer error occured */
! #define SERIAL_EV_RX80FULL 0x0400 /* Receive buffer is 80 percent full */
! #define SERIAL_EV_EVENT1 0x0800 /* Provider specific event 1 */
! #define SERIAL_EV_EVENT2 0x1000 /* Provider specific event 2 */
/* Modem Status */
***************
*** 504,512 ****
int count = 0;
! // skip the first colon
optarg++;
while ((pos = next_arg(optarg, ',')) && *id < RDPDR_MAX_DEVICES)
{
! // Init data structures for device
pser_inf = (SERIAL_DEVICE *) xmalloc(sizeof(SERIAL_DEVICE));
pser_inf->ptermios = (struct termios *) xmalloc(sizeof(struct termios));
--- 504,512 ----
int count = 0;
! /* skip the first colon */
optarg++;
while ((pos = next_arg(optarg, ',')) && *id < RDPDR_MAX_DEVICES)
{
! /* Init data structures for device */
pser_inf = (SERIAL_DEVICE *) xmalloc(sizeof(SERIAL_DEVICE));
pser_inf->ptermios = (struct termios *) xmalloc(sizeof(struct termios));
***************
*** 524,528 ****
printf("SERIAL %s to %s\n", g_rdpdr_device[*id].name,
g_rdpdr_device[*id].local_path);
! // set device type
g_rdpdr_device[*id].device_type = DEVICE_TYPE_SERIAL;
g_rdpdr_device[*id].pdevice_data = (void *) pser_inf;
--- 524,528 ----
printf("SERIAL %s to %s\n", g_rdpdr_device[*id].name,
g_rdpdr_device[*id].local_path);
! /* set device type */
g_rdpdr_device[*id].device_type = DEVICE_TYPE_SERIAL;
g_rdpdr_device[*id].pdevice_data = (void *) pser_inf;
***************
*** 560,564 ****
}
! // Store handle for later use
g_rdpdr_device[device_id].handle = serial_fd;
--- 560,564 ----
}
! /* Store handle for later use */
g_rdpdr_device[device_id].handle = serial_fd;
***************
*** 619,624 ****
ptermios = pser_inf->ptermios;
! // Set timeouts kind of like the windows serial timeout parameters. Multiply timeout
! // with requested read size
if (pser_inf->read_total_timeout_multiplier | pser_inf->read_total_timeout_constant)
{
--- 619,624 ----
ptermios = pser_inf->ptermios;
! /* Set timeouts kind of like the windows serial timeout parameters. Multiply timeout
! with requested read size */
if (pser_inf->read_total_timeout_multiplier | pser_inf->read_total_timeout_constant)
{
***************
*** 632,638 ****
}
! // If a timeout is set, do a blocking read, which times out after some time.
! // It will make rdesktop less responsive, but it will improve serial performance, by not
! // reading one character at a time.
if (timeout == 0)
{
--- 632,638 ----
}
! /* If a timeout is set, do a blocking read, which times out after some time.
! It will make rdesktop less responsive, but it will improve serial performance, by not
! reading one character at a time. */
if (timeout == 0)
{
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click