whitespace cleanup to force snapshot.

13 files changed, 74 insertions, 74 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index fdd452cd2..5a97111dd 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -55,7 +55,7 @@
 
 	* fhandler_disk_file.cc (fhandler_base::fstat_helper): Fix inode number
 	debug output.
-	(fhandler_disk_file::fchown): Always set sensible permission values 
+	(fhandler_disk_file::fchown): Always set sensible permission values
 	when creating the ACL for symlinks.
 
 2005-12-20  Corinna Vinschen  <corinna@vinschen.de>
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 46c742b21..152210ff3 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -927,8 +927,8 @@ ctrl_c_handler (DWORD type)
       int sig = SIGINT;
       /* If intr and quit are both mapped to ^C, send SIGQUIT on ^BREAK */
       if (type == CTRL_BREAK_EVENT
-          && t->ti.c_cc[VINTR] == 3 && t->ti.c_cc[VQUIT] == 3)
-        sig = SIGQUIT;
+	  && t->ti.c_cc[VINTR] == 3 && t->ti.c_cc[VQUIT] == 3)
+	sig = SIGQUIT;
       t->last_ctrl_c = GetTickCount ();
       killsys (-myself->pid, sig);
       t->last_ctrl_c = GetTickCount ();
@@ -1269,12 +1269,12 @@ _cygtls::call_signal_handler ()
 	  sigfunc (thissig);
 	}
       else
-        {
+	{
 	  siginfo_t thissi = infodata;
-          void (*sigact) (int, siginfo_t *, void *) = (void (*) (int, siginfo_t *, void *)) func;
-          /* no ucontext_t information provided yet */
-          sigact (thissig, &thissi, NULL);
-        }
+	  void (*sigact) (int, siginfo_t *, void *) = (void (*) (int, siginfo_t *, void *)) func;
+	  /* no ucontext_t information provided yet */
+	  sigact (thissig, &thissi, NULL);
+	}
       incyg++;
       set_signal_mask (this_oldmask, myself->getsigmask ());
       if (this_errno >= 0)
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 66585f00f..15d278d55 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -571,7 +571,7 @@ fhandler_disk_file::fchown (__uid32_t uid, __gid32_t gid)
 	 permissions of symlinks to a sensible value which allows the
 	 world to read the symlink and only the new owner to change it. */
       if (pc.issymlink ())
-        attrib = S_IFLNK | STD_RBITS | STD_WBITS;
+	attrib = S_IFLNK | STD_RBITS | STD_WBITS;
       res = set_file_attribute (pc.has_acls (), get_io_handle (), pc,
 				uid, gid, attrib);
     }
@@ -1306,15 +1306,15 @@ fhandler_disk_file::rmdir ()
 	continue;
 
       /* On 9X ERROR_ACCESS_DENIED is returned if you try to remove a
-         non-empty directory. */
+	 non-empty directory. */
       if (err == ERROR_ACCESS_DENIED
 	  && wincap.access_denied_on_delete ())
 	err = ERROR_DIR_NOT_EMPTY;
       /* ...and, that's *not* funny, when trying to remove a non-existing
-         directory on a share, which is hosted by a 9x machine, the error
+	 directory on a share, which is hosted by a 9x machine, the error
 	 code ERROR_INVALID_FUNCTION is returned.  */
       else if (err == ERROR_INVALID_FUNCTION)
-        err = ERROR_FILE_NOT_FOUND;
+	err = ERROR_FILE_NOT_FOUND;
 
       __seterrno_from_win_error (err);
 
diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler_floppy.cc
index a8b99b266..ae3156b29 100644
--- a/winsup/cygwin/fhandler_floppy.cc
+++ b/winsup/cygwin/fhandler_floppy.cc
@@ -102,7 +102,7 @@ fhandler_dev_floppy::get_drive_info (struct hd_geometry *geo)
   else
     {
       /* Getting the partition size by using the drive geometry information
-         looks wrong, but this is a historical necessity.  NT4 didn't maintain
+	 looks wrong, but this is a historical necessity.  NT4 didn't maintain
 	 partition information for the whole drive (aka "partition 0"), but
 	 returned ERROR_INVALID_HANDLE instead.  That got fixed in W2K. */
       drive_size = di->Cylinders.QuadPart * di->TracksPerCylinder *
@@ -119,7 +119,7 @@ fhandler_dev_floppy::get_drive_info (struct hd_geometry *geo)
       else if (pi)
 	geo->start = pi->StartingOffset.QuadPart >> 9ULL;
       else
-        geo->start = 0;
+	geo->start = 0;
     }
   return 0;
 }
@@ -461,7 +461,7 @@ fhandler_dev_floppy::ioctl (unsigned int cmd, void *buf)
       }
     case RDSETBLK:
       /* Just check the restriction that blocksize must be a multiple
-         of the sector size of the underlying volume sector size,
+	 of the sector size of the underlying volume sector size,
 	 then fall through to fhandler_dev_raw::ioctl. */
       struct rdop *op = (struct rdop *) buf;
       if (op->rd_parm % bytes_per_sector)
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index 57e743afb..80a7c4052 100644
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler_socket.cc
@@ -1063,9 +1063,9 @@ fhandler_socket::recvfrom (void *ptr, size_t len, int flags,
 	return len;
 
       /* ESHUTDOWN isn't defined for recv in SUSv3.  Simply EOF is returned
-         in this case. */
+	 in this case. */
       if (WSAGetLastError () == WSAESHUTDOWN)
-        return 0;
+	return 0;
 
       set_winsock_errno ();
     }
@@ -1152,9 +1152,9 @@ fhandler_socket::recvmsg (struct msghdr *msg, int flags, ssize_t tot)
 	return len;
 
       /* ESHUTDOWN isn't defined for recv in SUSv3.  Simply EOF is returned
-         in this case. */
+	 in this case. */
       if (WSAGetLastError () == WSAESHUTDOWN)
-        return 0;
+	return 0;
 
       set_winsock_errno ();
     }
diff --git a/winsup/cygwin/fhandler_tape.cc b/winsup/cygwin/fhandler_tape.cc
index 0b4e53773..055519be0 100644
--- a/winsup/cygwin/fhandler_tape.cc
+++ b/winsup/cygwin/fhandler_tape.cc
@@ -1237,7 +1237,7 @@ fhandler_dev_tape::open (int flags, mode_t)
 					 TAPE_SPACE_FILEMARKS, 1, true);
 
       if (!(flags & O_DIRECT))
-        {
+	{
 	  devbufsiz = mt->drive (driveno ())->dp ()->MaximumBlockSize;
 	  devbuf = new char [devbufsiz];
 	}
@@ -1466,7 +1466,7 @@ fhandler_dev_tape::dup (fhandler_base *child)
   lock (-1);
   fhandler_dev_tape *fh = (fhandler_dev_tape *) child;
   if (!DuplicateHandle (hMainProc, mt_mtx, hMainProc, &fh->mt_mtx, 0, TRUE,
-  			DUPLICATE_SAME_ACCESS))
+			DUPLICATE_SAME_ACCESS))
     {
       debug_printf ("dup(%s) failed, mutex handle %x, %E",
 		    get_name (), mt_mtx);
@@ -1476,7 +1476,7 @@ fhandler_dev_tape::dup (fhandler_base *child)
   fh->mt_evt = NULL;
   if (mt_evt &&
       !DuplicateHandle (hMainProc, mt_evt, hMainProc, &fh->mt_evt, 0, TRUE,
-  			DUPLICATE_SAME_ACCESS))
+			DUPLICATE_SAME_ACCESS))
     {
       debug_printf ("dup(%s) failed, event handle %x, %E",
 		    get_name (), mt_evt);
diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc
index 59e59ccd0..59a0cae30 100644
--- a/winsup/cygwin/init.cc
+++ b/winsup/cygwin/init.cc
@@ -150,13 +150,13 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)
       dynamically_loaded = (static_load == NULL);
 
       /* Is the stack at an unusual address?  This is, an address which
-         is in the usual space occupied by the process image, but below
+	 is in the usual space occupied by the process image, but below
 	 the auto load address of DLLs?
 	 Check if we're running in WOW64 on a 64 bit machine *and* are
 	 spawned by a genuine 64 bit process.  If so, respawn. */
       if (&is_wow64_proc >= (PBOOL) 0x400000
-          && &is_wow64_proc <= (PBOOL) 0x10000000
-          && IsWow64Process (GetCurrentProcess (), &is_wow64_proc)
+	  && &is_wow64_proc <= (PBOOL) 0x10000000
+	  && IsWow64Process (GetCurrentProcess (), &is_wow64_proc)
 	  && is_wow64_proc)
 	respawn_wow64_process ();
 
diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc
index f613ecf0e..46deea31c 100644
--- a/winsup/cygwin/mmap.cc
+++ b/winsup/cygwin/mmap.cc
@@ -216,9 +216,9 @@ CreateMapping9x (HANDLE fhdl, size_t len, _off64_t off, DWORD openflags,
       debug_printf ("named sharing");
       DWORD access = gen_access (openflags, flags);
       /* Different access modes result in incompatible mappings.  So we
-         create different maps per access mode by using different names. */
+	 create different maps per access mode by using different names. */
       switch (access)
-        {
+	{
 	  case FILE_MAP_READ:
 	    namebuf[0] = 'R';
 	    break;
@@ -242,7 +242,7 @@ CreateMapping9x (HANDLE fhdl, size_t len, _off64_t off, DWORD openflags,
       high = (off + len) >> 32;
       low = (off + len) & UINT32_MAX;
       /* Auto-grow only works if the protection is PAGE_READWRITE.  So,
-         first we call CreateFileMapping with PAGE_READWRITE, then, if the
+	 first we call CreateFileMapping with PAGE_READWRITE, then, if the
 	 requested protection is different, we close the mapping and
 	 reopen it again with the correct protection, if auto-grow worked. */
       h = CreateFileMapping (fhdl, &sec_none, PAGE_READWRITE,
@@ -286,14 +286,14 @@ CreateMappingNT (HANDLE fhdl, size_t len, _off64_t off, DWORD openflags,
   else if (autogrow (flags))
     {
       /* Auto-grow only works if the protection is PAGE_READWRITE.  So,
-         first we call NtCreateSection with PAGE_READWRITE, then, if the
+	 first we call NtCreateSection with PAGE_READWRITE, then, if the
 	 requested protection is different, we close the mapping and
 	 reopen it again with the correct protection, if auto-grow worked. */
       sectionsize.QuadPart += off;
       ret = NtCreateSection (&h, SECTION_ALL_ACCESS, &oa,
 			     &sectionsize, PAGE_READWRITE, attributes, fhdl);
       if (NT_SUCCESS (ret) && protect != PAGE_READWRITE)
-        {
+	{
 	  CloseHandle (h);
 	  ret = NtCreateSection (&h, SECTION_ALL_ACCESS, &oa,
 				 &sectionsize, protect, attributes, fhdl);
@@ -302,7 +302,7 @@ CreateMappingNT (HANDLE fhdl, size_t len, _off64_t off, DWORD openflags,
   else
     {
       /* Zero len creates mapping for whole file and allows
-         AT_EXTENDABLE_FILE mapping, if we ever use it... */
+	 AT_EXTENDABLE_FILE mapping, if we ever use it... */
       sectionsize.QuadPart = 0;
       ret = NtCreateSection (&h, SECTION_ALL_ACCESS, &oa,
 			     &sectionsize, protect, attributes, fhdl);
@@ -361,7 +361,7 @@ MapViewNT (HANDLE h, void *addr, size_t len, DWORD openflags,
     {
       base = NULL;
       ret = NtMapViewOfSection (h, GetCurrentProcess (), &base, 0, commitsize,
-      				&offset, &viewsize, ViewShare, 0, protect);
+				&offset, &viewsize, ViewShare, 0, protect);
     }
   if (!NT_SUCCESS (ret))
     {
@@ -376,7 +376,7 @@ MapViewNT (HANDLE h, void *addr, size_t len, DWORD openflags,
 struct mmap_func_t
 {
   HANDLE (*CreateMapping)(HANDLE, size_t, _off64_t, DWORD, int, int,
-  			  const char *);
+			  const char *);
   void * (*MapView)(HANDLE, void *, size_t, DWORD, int, int, _off64_t);
   BOOL	 (*VirtualProt)(PVOID, SIZE_T, DWORD, PDWORD);
   BOOL	 (*VirtualProtEx)(HANDLE, PVOID, SIZE_T, DWORD, PDWORD);
@@ -439,7 +439,7 @@ class mmap_record
 
   public:
     mmap_record (int nfd, HANDLE h, DWORD of, int p, int f, _off64_t o, DWORD l,
-    		 caddr_t b) :
+		 caddr_t b) :
        fd (nfd),
        mapping_hdl (h),
        openflags (of),
@@ -485,7 +485,7 @@ class mmap_record
 
     fhandler_base *alloc_fh ();
     void free_fh (fhandler_base *fh);
-    
+
     DWORD gen_create_protect () const
       { return ::gen_create_protect (get_openflags (), get_flags ()); }
     DWORD gen_protect () const
@@ -758,7 +758,7 @@ list::search_record (caddr_t addr, DWORD len, caddr_t &m_addr, DWORD &m_len,
       low = (addr >= recs[i].get_address ()) ? addr : recs[i].get_address ();
       high = recs[i].get_address ();
       if (recs[i].filler ())
-        high += recs[i].get_len ();
+	high += recs[i].get_len ();
       else
 	high += (PAGE_CNT (recs[i].get_len ()) * getpagesize ());
       high = (addr + len < high) ? addr + len : high;
@@ -992,7 +992,7 @@ mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off)
      to enable remapping of formerly mapped pages.  If no matching
      free pages exist, check addr again, this time for the real alignment. */
   DWORD checkpagesize = wincap.has_mmap_alignment_bug () ?
-  			getsystempagesize () : pagesize;
+			getsystempagesize () : pagesize;
   if (fixed (flags) && ((uintptr_t) addr % checkpagesize))
     {
       set_errno (EINVAL);
@@ -1018,14 +1018,14 @@ mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off)
       fd = -1;
       flags |= MAP_ANONYMOUS;
       /* Anonymous mappings are always forced to pagesize length with
-         no offset. */
+	 no offset. */
       len = roundup2 (len, pagesize);
       off = 0;
     }
   else if (fh->get_device () == FH_FS)
     {
       /* EACCES error conditions according to SUSv3.  File must be opened
-         for reading, regardless of the requested protection, and file must
+	 for reading, regardless of the requested protection, and file must
 	 be opened for writing when PROT_WRITE together with MAP_SHARED
 	 is requested. */
       if (!(fh->get_access () & GENERIC_READ)
@@ -1037,9 +1037,9 @@ mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off)
 	}
 
       /* On 9x you can't create mappings with PAGE_WRITECOPY protection if
-         the file isn't explicitely opened with WRITE access. */
+	 the file isn't explicitely opened with WRITE access. */
       if (!wincap.is_winnt () && priv (flags)
-      	  && !(fh->get_access () & GENERIC_WRITE))
+	  && !(fh->get_access () & GENERIC_WRITE))
 	{
 	  HANDLE h = CreateFile (fh->get_win32_name (),
 				 fh->get_access () | GENERIC_WRITE,
@@ -1059,9 +1059,9 @@ mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off)
 	}
 
       /* On NT you can't create mappings with PAGE_EXECUTE protection if
-         the file isn't explicitely opened with EXECUTE access. */
+	 the file isn't explicitely opened with EXECUTE access. */
       if (wincap.is_winnt ())
-        {
+	{
 	  HANDLE h = CreateFile (fh->get_win32_name (),
 				 fh->get_access () | GENERIC_EXECUTE,
 				 wincap.shared (), &sec_none_nih,
@@ -1119,7 +1119,7 @@ mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off)
 	  if (autogrow (flags))
 	    {
 	      /* Allow mapping beyond EOF if MAP_AUTOGROW flag is set.
-	         Check if file has been opened for writing, otherwise
+		 Check if file has been opened for writing, otherwise
 		 MAP_AUTOGROW is invalid. */
 	      if (!(fh->get_access () & GENERIC_WRITE))
 		{
@@ -1148,9 +1148,9 @@ go_ahead:
     {
       caddr_t tried = map_list->try_map (addr, len, flags, off);
       /* try_map returns NULL if no map matched, otherwise it returns
-         a valid address, of MAP_FAILED in case of a fatal error. */
+	 a valid address, of MAP_FAILED in case of a fatal error. */
       if (tried)
-        {
+	{
 	  ret = tried;
 	  goto out;
 	}
@@ -1433,7 +1433,7 @@ mprotect (void *addr, size_t len, int prot)
 
       ret = VirtualQuery (addr, &mbi, sizeof mbi);
       if (ret)
-        {
+	{
 	  /* If write protection is requested, check if the page was
 	     originally protected writecopy.  In this case call VirtualProtect
 	     requesting PAGE_WRITECOPY, otherwise the VirtualProtect will fail
@@ -1490,7 +1490,7 @@ mlock (const void *addr, size_t len)
 	     requested locking region fits in.  Unfortunately I don't know
 	     any function which would return the currently locked pages of
 	     a process (no go with NtQueryVirtualMemory).
- 
+
 	     So, except for the border cases, what we do here is something
 	     really embarrassing.  We raise the working set by 64K at a time
 	     and retry, until either we fail to raise the working set size
@@ -1519,7 +1519,7 @@ mlock (const void *addr, size_t len)
       else if (!NT_SUCCESS (status))
 	__seterrno_from_nt_status (status);
       else
-        ret = 0;
+	ret = 0;
     }
   while (status == STATUS_WORKING_SET_QUOTA);
 
@@ -1609,7 +1609,7 @@ fhandler_dev_zero::mmap (caddr_t *addr, size_t len, int prot,
   if (priv (flags) && !filler (prot))
     {
       /* Private anonymous maps are now implemented using VirtualAlloc.
-         This has two advantages:
+	 This has two advantages:
 
 	 - VirtualAlloc has a smaller footprint than a copy-on-write
 	   anonymous map.
@@ -1697,7 +1697,7 @@ fhandler_dev_zero::fixup_mmap_after_fork (HANDLE h, int prot, int flags,
     {
       DWORD alloc_type = MEM_RESERVE | (noreserve (flags) ? 0 : MEM_COMMIT);
       /* Always allocate R/W so that ReadProcessMemory doesn't fail
-         due to a non-writable target address.  The protection is
+	 due to a non-writable target address.  The protection is
 	 set to the correct one anyway in the fixup loop. */
       base = VirtualAlloc (address, size, alloc_type, PAGE_READWRITE);
     }
@@ -1730,7 +1730,7 @@ fhandler_disk_file::mmap (caddr_t *addr, size_t len, int prot,
     }
 
   void *base = mmap_func->MapView (h, *addr, len, get_access (),
-  				   prot, flags, off);
+				   prot, flags, off);
   if (!base || (fixed (flags) && base != *addr))
     {
       if (!base)
@@ -1828,13 +1828,13 @@ fhandler_dev_mem::mmap (caddr_t *addr, size_t len, int prot,
     }
 
   void *base = MapViewNT (h, *addr, len, get_access (),
-  			  prot, flags | MAP_ANONYMOUS, off);
+			  prot, flags | MAP_ANONYMOUS, off);
   if (!base || (fixed (flags) && base != *addr))
     {
       if (!base)
-        __seterrno ();
+	__seterrno ();
       else
-        {
+	{
 	  NtUnmapViewOfSection (GetCurrentProcess (), base);
 	  set_errno (EINVAL);
 	  debug_printf ("MapView: address shift with MAP_FIXED given");
@@ -1922,7 +1922,7 @@ fixup_mmaps_after_fork (HANDLE parent)
 	  if (!ret)
 	    {
 	      if (rec->attached ())
-	        {
+		{
 		  system_printf ("Warning: Fixup mapping beyond EOF failed");
 		  continue;
 		}
@@ -1937,21 +1937,21 @@ fixup_mmaps_after_fork (HANDLE parent)
 	       address += mbi.RegionSize)
 	    {
 	      if (!VirtualQueryEx (parent, address, &mbi, sizeof mbi))
-	        {
+		{
 		  system_printf ("VirtualQueryEx failed for MAP_PRIVATE "
-		  		 "address %p, %E", address);
+				 "address %p, %E", address);
 		  return -1;
 		}
 	      /* Just skip reserved pages. */
 	      if (mbi.State == MEM_RESERVE)
 		continue;
 	      /* Copy-on-write pages must be copied to the child to circumvent
-	         a strange notion how copy-on-write is supposed to work. */
+		 a strange notion how copy-on-write is supposed to work. */
 	      if (rec->priv ())
 		{
 		  if (rec->anonymous () && rec->noreserve ()
 		      && !VirtualAlloc (address, mbi.RegionSize,
-		      			MEM_COMMIT, PAGE_READWRITE))
+					MEM_COMMIT, PAGE_READWRITE))
 		    {
 		      system_printf ("VirtualAlloc failed for MAP_PRIVATE "
 				     "address %p, %E", address);
@@ -1999,7 +1999,7 @@ fixup_mmaps_after_fork (HANDLE parent)
 		  MEMORY_BASIC_INFORMATION m;
 		  VirtualQuery (address, &m, sizeof m);
 		  system_printf ("VirtualProtect failed for "
-		  		 "address %p, "
+				 "address %p, "
 				 "parentstate: 0x%x, "
 				 "state: 0x%x, "
 				 "parentprot: 0x%x, "
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index 655cb1105..a3fde3019 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -681,10 +681,10 @@ cygwin_setsockopt (int fd, int level, int optname, const void *optval,
     {
       /* Old applications still use the old Winsock1 IPPROTO_IP values. */
       if (level == IPPROTO_IP && CYGWIN_VERSION_CHECK_FOR_USING_WINSOCK1_VALUES)
-        optname = convert_ws1_ip_optname (optname);
+	optname = convert_ws1_ip_optname (optname);
       /* FOR THE RECORDS:
 
-         Setting IP_TOS is disabled by default since W2K, the official
+	 Setting IP_TOS is disabled by default since W2K, the official
 	 reason being that IP_TOS setting would interfere with Windows
 	 QOS settings.  As result, setsockopt returns with WinSock error
 	 10022, WSAEINVAL, when running under W2K or later, instead of
@@ -731,7 +731,7 @@ cygwin_getsockopt (int fd, int level, int optname, void *optval, int *optlen)
     {
       /* Old applications still use the old Winsock1 IPPROTO_IP values. */
       if (level == IPPROTO_IP && CYGWIN_VERSION_CHECK_FOR_USING_WINSOCK1_VALUES)
-        optname = convert_ws1_ip_optname (optname);
+	optname = convert_ws1_ip_optname (optname);
       res = getsockopt (fh->get_socket (), level, optname, (char *) optval,
 			(int *) optlen);
 
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 21c3b92bf..f2b56cf1f 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -247,7 +247,7 @@ normalize_posix_path (const char *src, char *dst, char *&tail)
 	return get_errno ();
       tail = strchr (tail, '\0');
       if (isslash (dst[0]) && isslash (dst[1]))
-        ++dst_start;
+	++dst_start;
       if (*src == '.')
 	{
 	  if (tail == dst_start + 1 && *dst_start == '/')
@@ -1112,14 +1112,14 @@ normalize_win32_path (const char *src, char *dst, char *&tail)
   if (beg_src_slash && isdirsep (src[1]))
     {
       if (isdirsep (src[2]))
-        {
+	{
 	  /* More than two slashes are just folded into one. */
 	  src += 2;
 	  while (isdirsep (src[1]))
 	    ++src;
 	}
       else
-        {
+	{
 	  /* Two slashes start a network or device path. */
 	  *tail++ = '\\';
 	  src++;
@@ -3717,10 +3717,10 @@ realpath (const char *path, char *resolved)
     {
       if (!resolved)
 	{
-          resolved = (char *) malloc (strlen (real_path.normalized_path) + 1);
-          if (!resolved)
+	  resolved = (char *) malloc (strlen (real_path.normalized_path) + 1);
+	  if (!resolved)
 	    return NULL;
-        }
+	}
       return strcpy (resolved, real_path.normalized_path);
     }
 
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 2cf848ebf..cc7cdbf78 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -1176,14 +1176,14 @@ out:
      the function will exit without adding anything to the pid list.
 
      If p is "true" then we've discovered a cygwin process.
-     
+
      Handle "myself" differently.  Don't copy it and close/zero the handle we
      just opened to it.
      If not performing a copy, then keep the process handle open for the duration
      of the life of the procinfo region to potential races when a new process uses
      this pid.
      Otherwise, malloc some memory for a copy of the shared memory.
-     
+
      If the malloc failed, then "oh well".  Just keep the shared memory around
      and eventually close the handle when the winpids goes out of scope.
 
diff --git a/winsup/cygwin/sysconf.cc b/winsup/cygwin/sysconf.cc
index 7bd8cb618..bdbbb99be 100644
--- a/winsup/cygwin/sysconf.cc
+++ b/winsup/cygwin/sysconf.cc
@@ -124,7 +124,7 @@ sysconf (int in)
       case _SC_TTY_NAME_MAX:
 	return TTY_NAME_MAX;
       case _SC_MEMLOCK_RANGE:
-        return _POSIX_MEMLOCK_RANGE;
+	return _POSIX_MEMLOCK_RANGE;
     }
 
   /* Invalid input or unimplemented sysconf name */
diff --git a/winsup/cygwin/syslog.cc b/winsup/cygwin/syslog.cc
index a4beaea74..fc6758b62 100644
--- a/winsup/cygwin/syslog.cc
+++ b/winsup/cygwin/syslog.cc
@@ -233,7 +233,7 @@ out:
       sprintf (pribuf, "<%d>", priority);
       struct iovec iv[2] =
       {
-        { pribuf, strlen (pribuf) },
+	{ pribuf, strlen (pribuf) },
 	{ (char *) msg, len }
       };