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

* fhandler_disk_file.cc: White space. 

* fhandler_proc.cc: Ditto.
* fhandler_virtual.cc: Ditto.
This commit is contained in:
Christopher Faylor 2007-07-07 16:46:35 +00:00
parent 7b44665a7b
commit 8581e92c51
4 changed files with 30 additions and 24 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>
* fhandler_disk_file.cc: White space.
* fhandler_proc.cc: Ditto.
* fhandler_virtual.cc: Ditto.
2007-07-07 Christopher Faylor <me+cygwin@cgf.cx> 2007-07-07 Christopher Faylor <me+cygwin@cgf.cx>
* fork.cc: White space. * fork.cc: White space.

14
winsup/cygwin/fhandler_disk_file.cc
View File

@ -558,8 +558,8 @@ fhandler_disk_file::fstatvfs (struct statvfs *sfs)
query_open (query_read_control); query_open (query_read_control);
oret = open_fs (O_RDONLY | O_BINARY, 0); oret = open_fs (O_RDONLY | O_BINARY, 0);
if (!oret) if (!oret)
{ {
/* Can't open file. Try again with rootdir. */ /* Can't open file. Try again with rootdir. */
char root[CYG_MAX_PATH]; char root[CYG_MAX_PATH];
if (!rootdir (get_win32_name (), root)) if (!rootdir (get_win32_name (), root))
goto out; goto out;
@ -595,7 +595,7 @@ fhandler_disk_file::fstatvfs (struct statvfs *sfs)
first, which is only available since W2K. If that fails, try to first, which is only available since W2K. If that fails, try to
retrieve normal allocation information. */ retrieve normal allocation information. */
status = NtQueryVolumeInformationFile (get_handle (), &io, &full_fsi, status = NtQueryVolumeInformationFile (get_handle (), &io, &full_fsi,
sizeof full_fsi, sizeof full_fsi,
FileFsFullSizeInformation); FileFsFullSizeInformation);
if (NT_SUCCESS (status)) if (NT_SUCCESS (status))
{ {
@ -605,7 +605,7 @@ fhandler_disk_file::fstatvfs (struct statvfs *sfs)
sfs->f_bfree = full_fsi.ActualAvailableAllocationUnits.LowPart; sfs->f_bfree = full_fsi.ActualAvailableAllocationUnits.LowPart;
sfs->f_bavail = full_fsi.CallerAvailableAllocationUnits.LowPart; sfs->f_bavail = full_fsi.CallerAvailableAllocationUnits.LowPart;
if (sfs->f_bfree > sfs->f_bavail) if (sfs->f_bfree > sfs->f_bavail)
{ {
/* Quotas active. We can't trust TotalAllocationUnits. */ /* Quotas active. We can't trust TotalAllocationUnits. */
NTFS_VOLUME_DATA_BUFFER nvdb; NTFS_VOLUME_DATA_BUFFER nvdb;
DWORD bytes; DWORD bytes;
@ -1586,7 +1586,7 @@ fhandler_disk_file::opendir (int fd)
else else
{ {
/* opendir() case. Initialize with given directory name and /* opendir() case. Initialize with given directory name and
NULL directory handle. */ NULL directory handle. */
pc.get_nt_native_path (upath); pc.get_nt_native_path (upath);
InitializeObjectAttributes (&attr, &upath, InitializeObjectAttributes (&attr, &upath,
OBJ_CASE_INSENSITIVE | OBJ_INHERIT, OBJ_CASE_INSENSITIVE | OBJ_INHERIT,
@ -1620,12 +1620,12 @@ fhandler_disk_file::opendir (int fd)
} }
} }
if (fd >= 0) if (fd >= 0)
{ {
dir->__flags |= dirent_valid_fd; dir->__flags |= dirent_valid_fd;
dir->__d_fd = fd; dir->__d_fd = fd;
} }
else else
{ {
/* Filling cfd with `this' (aka storing this in the file /* Filling cfd with `this' (aka storing this in the file
descriptor table should only happen after it's clear that descriptor table should only happen after it's clear that
opendir doesn't fail, otherwise we end up cfree'ing the opendir doesn't fail, otherwise we end up cfree'ing the

30
winsup/cygwin/fhandler_proc.cc
View File

@ -355,7 +355,7 @@ fhandler_proc::fill_filebuf ()
+ strlen (uts_name.version) + 2; + strlen (uts_name.version) + 2;
filebuf = (char *) crealloc (filebuf, bufalloc); filebuf = (char *) crealloc (filebuf, bufalloc);
filesize = __small_sprintf (filebuf, "%s %s %s\n", filesize = __small_sprintf (filebuf, "%s %s %s\n",
uts_name.sysname, uts_name.release, uts_name.sysname, uts_name.release,
uts_name.version); uts_name.version);
} }
break; break;
@ -636,7 +636,7 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
for (cpu_number = 0; ; cpu_number++) for (cpu_number = 0; ; cpu_number++)
{ {
if (cpu_number) if (cpu_number)
print ("\n"); print ("\n");
__small_sprintf (szBuffer, "HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%d", cpu_number); __small_sprintf (szBuffer, "HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%d", cpu_number);
@ -734,9 +734,9 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
//unsigned cpu_count = (extra_info & 0x00ff0000) >> 16; //unsigned cpu_count = (extra_info & 0x00ff0000) >> 16;
unsigned apic_id = (extra_info & 0xff000000) >> 24; unsigned apic_id = (extra_info & 0xff000000) >> 24;
if (family == 15) if (family == 15)
family += (cpuid_sig >> 20) & 0xff; family += (cpuid_sig >> 20) & 0xff;
if (family >= 6) if (family >= 6)
model += ((cpuid_sig >> 16) & 0x0f) << 4; model += ((cpuid_sig >> 16) & 0x0f) << 4;
unsigned maxe = 0; unsigned maxe = 0;
cpuid (&maxe, &unused, &unused, &unused, 0x80000000); cpuid (&maxe, &unused, &unused, &unused, 0x80000000);
if (maxe >= 0x80000004) if (maxe >= 0x80000004)
@ -760,11 +760,11 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
clflush = 64, clflush = 64,
cache_alignment = 64; cache_alignment = 64;
if (features1 & (1 << 19)) // CLFSH if (features1 & (1 << 19)) // CLFSH
clflush = ((extra_info >> 8) & 0xff) << 3; clflush = ((extra_info >> 8) & 0xff) << 3;
if (is_intel && family == 15) if (is_intel && family == 15)
cache_alignment = clflush * 2; cache_alignment = clflush * 2;
if (maxe >= 0x80000005) // L1 Cache and TLB Identifiers if (maxe >= 0x80000005) // L1 Cache and TLB Identifiers
{ {
unsigned data_cache, inst_cache; unsigned data_cache, inst_cache;
cpuid (&unused, &unused, &data_cache, &inst_cache, cpuid (&unused, &unused, &data_cache, &inst_cache,
0x80000005); 0x80000005);
@ -773,7 +773,7 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
tlb_size = 0; tlb_size = 0;
} }
if (maxe >= 0x80000006) // L2 Cache and L2 TLB Identifiers if (maxe >= 0x80000006) // L2 Cache and L2 TLB Identifiers
{ {
unsigned tlb, l2; unsigned tlb, l2;
cpuid (&unused, &tlb, &l2, &unused, 0x80000006); cpuid (&unused, &tlb, &l2, &unused, 0x80000006);
@ -791,12 +791,12 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
stepping, stepping,
cpu_mhz); cpu_mhz);
if (cache_size >= 0) if (cache_size >= 0)
bufptr += __small_sprintf (bufptr, "cache size\t: %d KB\n", bufptr += __small_sprintf (bufptr, "cache size\t: %d KB\n",
cache_size); cache_size);
// Recognize multi-core CPUs // Recognize multi-core CPUs
if (is_amd && maxe >= 0x80000008) if (is_amd && maxe >= 0x80000008)
{ {
unsigned core_info; unsigned core_info;
cpuid (&unused, &unused, &core_info, &unused, 0x80000008); cpuid (&unused, &unused, &core_info, &unused, 0x80000008);
@ -818,12 +818,12 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
} }
// Recognize Intel Hyper-Transport CPUs // Recognize Intel Hyper-Transport CPUs
else if (is_intel && (features1 & (1 << 28)) && maxf >= 4) else if (is_intel && (features1 & (1 << 28)) && maxf >= 4)
{ {
/* TODO */ /* TODO */
} }
bufptr += __small_sprintf (bufptr, "fpu\t\t: %s\n" bufptr += __small_sprintf (bufptr, "fpu\t\t: %s\n"
"fpu_exception\t: %s\n" "fpu_exception\t: %s\n"
"cpuid level\t: %d\n" "cpuid level\t: %d\n"
"wp\t\t: yes\n", "wp\t\t: yes\n",
(features1 & (1 << 0)) ? "yes" : "no", (features1 & (1 << 0)) ? "yes" : "no",
@ -957,16 +957,16 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
/* TODO: bogomips */ /* TODO: bogomips */
if (tlb_size >= 0) if (tlb_size >= 0)
bufptr += __small_sprintf (bufptr, bufptr += __small_sprintf (bufptr,
"TLB size\t: %d 4K pages\n", "TLB size\t: %d 4K pages\n",
tlb_size); tlb_size);
bufptr += __small_sprintf (bufptr, "clflush size\t: %d\n" bufptr += __small_sprintf (bufptr, "clflush size\t: %d\n"
"cache_alignment\t: %d\n", "cache_alignment\t: %d\n",
clflush, clflush,
cache_alignment); cache_alignment);
if (maxe >= 0x80000008) // Address size if (maxe >= 0x80000008) // Address size
{ {
unsigned addr_size, phys, virt; unsigned addr_size, phys, virt;
cpuid (&addr_size, &unused, &unused, &unused, 0x80000008); cpuid (&addr_size, &unused, &unused, &unused, 0x80000008);

4
winsup/cygwin/fhandler_virtual.cc
View File

@ -79,7 +79,7 @@ fhandler_virtual::opendir (int fd)
dir->__flags = 0; dir->__flags = 0;
if (fd >= 0) if (fd >= 0)
{ {
dir->__flags |= dirent_valid_fd; dir->__flags |= dirent_valid_fd;
dir->__d_fd = fd; dir->__d_fd = fd;
res = dir; res = dir;
@ -87,7 +87,7 @@ fhandler_virtual::opendir (int fd)
res = dir; res = dir;
} }
else else
{ {
cygheap_fdnew cfd; cygheap_fdnew cfd;
if (cfd >= 0) if (cfd >= 0)
{ {