JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fork.cc: White space.

Browse Source 
* net.cc: Ditto.
* posix_ipc.cc: Ditto.
This commit is contained in:
Christopher Faylor 2007-07-07 16:43:03 +00:00
parent a5a0080d9c
commit 7b44665a7b
4 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2007-07-07 Christopher Faylor <me+cygwin@cgf.cx>
* fork.cc: White space.
* net.cc: Ditto.
* posix_ipc.cc: Ditto.
2007-07-06 Corinna Vinschen <corinna@vinschen.de> 2007-07-06 Corinna Vinschen <corinna@vinschen.de>
* times.cc (gettimeofday): Align definition to POSIX. * times.cc (gettimeofday): Align definition to POSIX.

20
winsup/cygwin/net.cc
View File

@ -1296,7 +1296,7 @@ get_routedst (DWORD if_index)
&& GetIpForwardTable (pift, &size, FALSE) == NO_ERROR) && GetIpForwardTable (pift, &size, FALSE) == NO_ERROR)
for (DWORD i = 0; i < pift->dwNumEntries; ++i) for (DWORD i = 0; i < pift->dwNumEntries; ++i)
{ {
if (pift->table[i].dwForwardIfIndex == if_index if (pift->table[i].dwForwardIfIndex == if_index
&& pift->table[i].dwForwardMask == INADDR_BROADCAST) && pift->table[i].dwForwardMask == INADDR_BROADCAST)
return pift->table[i].dwForwardDest; return pift->table[i].dwForwardDest;
} }
@ -1408,7 +1408,7 @@ get_xp_ifs (ULONG family)
{ {
/* Destination address */ /* Destination address */
if (sa->sa_family == AF_INET) if (sa->sa_family == AF_INET)
{ {
if_sin = (struct sockaddr_in *) &ifp->ifa_brddstaddr; if_sin = (struct sockaddr_in *) &ifp->ifa_brddstaddr;
if_sin->sin_addr.s_addr = get_routedst (pap->IfIndex); if_sin->sin_addr.s_addr = get_routedst (pap->IfIndex);
if_sin->sin_family = AF_INET; if_sin->sin_family = AF_INET;
@ -1417,7 +1417,7 @@ get_xp_ifs (ULONG family)
/* FIXME: No official way to get the dstaddr for ipv6? */ /* FIXME: No official way to get the dstaddr for ipv6? */
memcpy (&ifp->ifa_addr, sa, sa_size); memcpy (&ifp->ifa_addr, sa, sa_size);
ifp->ifa_ifa.ifa_dstaddr = (struct sockaddr *) ifp->ifa_ifa.ifa_dstaddr = (struct sockaddr *)
&ifp->ifa_brddstaddr; &ifp->ifa_brddstaddr;
} }
else else
{ {
@ -1604,7 +1604,7 @@ get_2k_ifs ()
{ {
ifp->ifa_ifa.ifa_flags |= IFF_UP | IFF_LOWER_UP; ifp->ifa_ifa.ifa_flags |= IFF_UP | IFF_LOWER_UP;
/* Bug in NT4's IP Helper lib. The dwOperStatus has just /* Bug in NT4's IP Helper lib. The dwOperStatus has just
two values, 0 or 1, non operational, operational. */ two values, 0 or 1, non operational, operational. */
if (ifrow->dwOperStatus >= (wincap.has_broken_if_oper_status () if (ifrow->dwOperStatus >= (wincap.has_broken_if_oper_status ()
? 1 : IF_OPER_STATUS_CONNECTED)) ? 1 : IF_OPER_STATUS_CONNECTED))
ifp->ifa_ifa.ifa_flags |= IFF_RUNNING; ifp->ifa_ifa.ifa_flags |= IFF_RUNNING;
@ -1625,7 +1625,7 @@ get_2k_ifs ()
{ {
/* Destination address */ /* Destination address */
if_sin->sin_addr.s_addr = if_sin->sin_addr.s_addr =
get_routedst (ipt->table[ip_cnt].dwIndex); get_routedst (ipt->table[ip_cnt].dwIndex);
ifp->ifa_ifa.ifa_dstaddr = (struct sockaddr *) ifp->ifa_ifa.ifa_dstaddr = (struct sockaddr *)
&ifp->ifa_brddstaddr; &ifp->ifa_brddstaddr;
} }
@ -1746,7 +1746,7 @@ get_nt_ifs ()
NULL, NULL, NULL, NULL,
(unsigned char *) netmask, (unsigned char *) netmask,
(size = 256, &size)) == ERROR_SUCCESS) (size = 256, &size)) == ERROR_SUCCESS)
++cnt; ++cnt;
RegCloseKey (key); RegCloseKey (key);
} }
++cnt; /* loopback */ ++cnt; /* loopback */
@ -1788,7 +1788,7 @@ get_nt_ifs ()
ifp->ifa_ifindex = -1; ifp->ifa_ifindex = -1;
/* Friendly name */ /* Friendly name */
struct ifreq_frndlyname *iff = (struct ifreq_frndlyname *) struct ifreq_frndlyname *iff = (struct ifreq_frndlyname *)
&ifp->ifa_frndlyname; &ifp->ifa_frndlyname;
strcpy (iff->ifrf_friendlyname, "Default loopback"); strcpy (iff->ifrf_friendlyname, "Default loopback");
iff->ifrf_len = 16; iff->ifrf_len = 16;
@ -1875,7 +1875,7 @@ get_nt_ifs ()
sin->sin_family = AF_INET; sin->sin_family = AF_INET;
ifp->ifa_ifa.ifa_netmask = (struct sockaddr *) &ifp->ifa_netmask; ifp->ifa_ifa.ifa_netmask = (struct sockaddr *) &ifp->ifa_netmask;
if (ppp) if (ppp)
{ {
/* Destination address */ /* Destination address */
sin = (struct sockaddr_in *) &ifp->ifa_brddstaddr; sin = (struct sockaddr_in *) &ifp->ifa_brddstaddr;
sin->sin_addr.s_addr = sin->sin_addr.s_addr =
@ -1885,7 +1885,7 @@ get_nt_ifs ()
&ifp->ifa_brddstaddr; &ifp->ifa_brddstaddr;
} }
else else
{ {
/* Broadcast address */ /* Broadcast address */
lip = cygwin_inet_addr (dhcp ? dhcpaddress : ip); lip = cygwin_inet_addr (dhcp ? dhcpaddress : ip);
lnp = cygwin_inet_addr (dhcp ? dhcpnetmask : np); lnp = cygwin_inet_addr (dhcp ? dhcpnetmask : np);
@ -1978,7 +1978,7 @@ get_ifconf (struct ifconf *ifc, int what)
++cnt; ++cnt;
strcpy (ifr->ifr_name, ifp->ifa_name); strcpy (ifr->ifr_name, ifp->ifa_name);
switch (what) switch (what)
{ {
case SIOCGIFFLAGS: case SIOCGIFFLAGS:
ifr->ifr_flags = ifp->ifa_ifa.ifa_flags; ifr->ifr_flags = ifp->ifa_ifa.ifa_flags;
break; break;

16
winsup/cygwin/posix_ipc.cc
View File

@ -266,7 +266,7 @@ struct mq_hdr
long mqh_nwait; /* #threads blocked in mq_receive() */ long mqh_nwait; /* #threads blocked in mq_receive() */
pid_t mqh_pid; /* nonzero PID if mqh_event set */ pid_t mqh_pid; /* nonzero PID if mqh_event set */
char mqh_uname[36]; /* unique name used to identify synchronization char mqh_uname[36]; /* unique name used to identify synchronization
objects connected to this queue */ objects connected to this queue */
struct sigevent mqh_event; /* for mq_notify() */ struct sigevent mqh_event; /* for mq_notify() */
}; };
@ -339,7 +339,7 @@ again:
/* Open and specify O_EXCL and user-execute */ /* Open and specify O_EXCL and user-execute */
fd = open (mqname, oflag | O_EXCL | O_RDWR, mode | S_IXUSR); fd = open (mqname, oflag | O_EXCL | O_RDWR, mode | S_IXUSR);
if (fd < 0) if (fd < 0)
{ {
if (errno == EEXIST && (oflag & O_EXCL) == 0) if (errno == EEXIST && (oflag & O_EXCL) == 0)
goto exists; /* already exists, OK */ goto exists; /* already exists, OK */
return (mqd_t) -1; return (mqd_t) -1;
@ -356,7 +356,7 @@ again:
/* Calculate and set the file size */ /* Calculate and set the file size */
msgsize = MSGSIZE (attr->mq_msgsize); msgsize = MSGSIZE (attr->mq_msgsize);
filesize = sizeof (struct mq_hdr) filesize = sizeof (struct mq_hdr)
+ (attr->mq_maxmsg * (sizeof (struct msg_hdr) + msgsize)); + (attr->mq_maxmsg * (sizeof (struct msg_hdr) + msgsize));
if (lseek64 (fd, filesize - 1, SEEK_SET) == -1) if (lseek64 (fd, filesize - 1, SEEK_SET) == -1)
goto err; goto err;
if (write (fd, "", 1) == -1) if (write (fd, "", 1) == -1)
@ -384,7 +384,7 @@ again:
mqhdr->mqh_nwait = 0; mqhdr->mqh_nwait = 0;
mqhdr->mqh_pid = 0; mqhdr->mqh_pid = 0;
if (!AllocateLocallyUniqueId (&luid)) if (!AllocateLocallyUniqueId (&luid))
{ {
__seterrno (); __seterrno ();
goto err; goto err;
} }
@ -926,7 +926,7 @@ again:
/* Open and specify O_EXCL and user-execute */ /* Open and specify O_EXCL and user-execute */
fd = open (semname, oflag | O_EXCL | O_RDWR, mode | S_IXUSR); fd = open (semname, oflag | O_EXCL | O_RDWR, mode | S_IXUSR);
if (fd < 0) if (fd < 0)
{ {
if (errno == EEXIST && (oflag & O_EXCL) == 0) if (errno == EEXIST && (oflag & O_EXCL) == 0)
goto exists; /* already exists, OK */ goto exists; /* already exists, OK */
return SEM_FAILED; return SEM_FAILED;
@ -934,17 +934,17 @@ again:
created = 1; created = 1;
/* First one to create the file initializes it. */ /* First one to create the file initializes it. */
if (!AllocateLocallyUniqueId (&sf.luid)) if (!AllocateLocallyUniqueId (&sf.luid))
{ {
__seterrno (); __seterrno ();
goto err; goto err;
} }
sf.value = value; sf.value = value;
sf.hash = hash_path_name (0, semname); sf.hash = hash_path_name (0, semname);
if (write (fd, &sf, sizeof sf) != sizeof sf) if (write (fd, &sf, sizeof sf) != sizeof sf)
goto err; goto err;
sem = semaphore::open (sf.hash, sf.luid, fd, oflag, mode, value, wasopen); sem = semaphore::open (sf.hash, sf.luid, fd, oflag, mode, value, wasopen);
if (sem == SEM_FAILED) if (sem == SEM_FAILED)
goto err; goto err;
/* Initialization complete, turn off user-execute bit */ /* Initialization complete, turn off user-execute bit */
if (fchmod (fd, mode) == -1) if (fchmod (fd, mode) == -1)
goto err; goto err;