JBoss Native SVN: r983 - trunk/sight/native/os/windows.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-09-06 11:51:07 -0400 (Thu, 06 Sep 2007)
New Revision: 983
Modified:
trunk/sight/native/os/windows/process.c
Log:
Fix union names for str
Modified: trunk/sight/native/os/windows/process.c
===================================================================
--- trunk/sight/native/os/windows/process.c 2007-09-06 13:55:19 UTC (rev 982)
+++ trunk/sight/native/os/windows/process.c 2007-09-06 15:51:07 UTC (rev 983)
@@ -247,30 +247,30 @@
for (i = 0; i < 2; i++) {
pages[i].len = 0;
- pages[i].w = NULL;
+ pages[i].str.w = NULL;
if (!VirtualQueryEx(hProcess, PEB_ADDRESS(i), &mbi, sizeof(mbi)))
continue;
nrd = mbi.RegionSize;
rdd = 0;
if (nrd > 8192)
continue;
- pages[i].w = apr_palloc(pool, nrd);
- if (!pages[i].w)
+ pages[i].str.w = apr_palloc(pool, nrd);
+ if (!pages[i].str.w)
continue;
if (!ReadProcessMemory(hProcess,
PEB_ADDRESS(i),
- pages[i].w,
+ pages[i].str.w,
nrd,
&rdd)) {
- pages[i].w = NULL;
- pages[i].len = 0;
+ pages[i].str.w = NULL;
+ pages[i].len = 0;
}
else {
pages[i].len = (jsize)(rdd / 2);
/* Make sure we always have double zero at the end */
- pages[i].w[pages[i].len - 1] = 0;
- pages[i].w[pages[i].len - 2] = 0;
+ pages[i].str.w[pages[i].len - 1] = 0;
+ pages[i].str.w[pages[i].len - 2] = 0;
}
}
}
@@ -438,11 +438,11 @@
*/
if (pid != (jint)GetCurrentProcessId()) {
read_proc_pages(pid, hProcess, &ppages[0], no->pool);
- if (ppages[0].w && (*ppages[0].w > 0x003C && *ppages[0].w < 0x007F)) {
- SET_IFIELD_O(0004, thiz, sight_mw_to_sa(_E, ppages[0].w));
+ if (ppages[0].str.w && (*ppages[0].str.w > 0x003C && *ppages[0].str.w < 0x007F)) {
+ SET_IFIELD_O(0004, thiz, sight_mw_to_sa(_E, ppages[0].str.w));
}
- if (ppages[1].w) {
- mproc = ppages[spage+1].w;
+ if (ppages[1].str.w) {
+ mproc = ppages[spage+1].str.w;
mpnrd = ppages[spage+1].len;
}
if (mproc && mpnrd) {
17 years, 6 months
JBoss Native SVN: r982 - in trunk/sight/native: share and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-09-06 09:55:19 -0400 (Thu, 06 Sep 2007)
New Revision: 982
Modified:
trunk/sight/native/include/sight_local.h
trunk/sight/native/share/jnu.c
Log:
Add realloc wrapper
Modified: trunk/sight/native/include/sight_local.h
===================================================================
--- trunk/sight/native/include/sight_local.h 2007-09-06 09:19:25 UTC (rev 981)
+++ trunk/sight/native/include/sight_local.h 2007-09-06 13:55:19 UTC (rev 982)
@@ -143,6 +143,7 @@
char *sight_pstrdupj(apr_pool_t *, JNIEnv *, jstring);
char *sight_strup(char *);
void *sight_malloc(JNIEnv *, apr_size_t, const char *, int);
+void *sight_realloc(JNIEnv *, void *, apr_size_t, const char *, int);
void *sight_calloc(JNIEnv *, apr_size_t, const char *, int);
void *sight_palloc(JNIEnv *, apr_pool_t *, apr_size_t,
const char *, int);
Modified: trunk/sight/native/share/jnu.c
===================================================================
--- trunk/sight/native/share/jnu.c 2007-09-06 09:19:25 UTC (rev 981)
+++ trunk/sight/native/share/jnu.c 2007-09-06 13:55:19 UTC (rev 982)
@@ -694,6 +694,18 @@
return p;
}
+void *sight_realloc(JNIEnv *_E, void *oldp, apr_size_t len,
+ const char *file, int line)
+{
+ void *p;
+ if (!(p = realloc(oldp, len))) {
+ if (_E)
+ throwAprMemoryException(_E, file, line,
+ apr_get_os_error());
+ }
+ return p;
+}
+
char *sight_strdup(JNIEnv *_E, const char *src,
const char *file, int line)
{
17 years, 6 months
JBoss Native SVN: r981 - trunk/sight/native/include/arch/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-09-06 05:19:25 -0400 (Thu, 06 Sep 2007)
New Revision: 981
Modified:
trunk/sight/native/include/arch/unix/sight_private.h
Log:
Add IANA IF types
Modified: trunk/sight/native/include/arch/unix/sight_private.h
===================================================================
--- trunk/sight/native/include/arch/unix/sight_private.h 2007-09-06 09:13:02 UTC (rev 980)
+++ trunk/sight/native/include/arch/unix/sight_private.h 2007-09-06 09:19:25 UTC (rev 981)
@@ -5,7 +5,7 @@
* Copyright(c) 2007 Red Hat Middleware, LLC,
* and individual contributors as indicated by the @authors tag.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * full listing of individual contributors.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -38,5 +38,154 @@
#define SIGHT_PLATFORM_DECLARE(RT, CL, FN) \
JNIEXPORT RT JNICALL Java_org_jboss_sight_platform_unix_##CL##_##FN
+/**
+ * IANA Network adapter types
+ */
+#define IF_TYPE_OTHER 1 /* None of the below */
+#define IF_TYPE_REGULAR_1822 2
+#define IF_TYPE_HDH_1822 3
+#define IF_TYPE_DDN_X25 4
+#define IF_TYPE_RFC877_X25 5
+#define IF_TYPE_ETHERNET_CSMACD 6
+#define IF_TYPE_IS088023_CSMACD 7
+#define IF_TYPE_ISO88024_TOKENBUS 8
+#define IF_TYPE_ISO88025_TOKENRING 9
+#define IF_TYPE_ISO88026_MAN 10
+#define IF_TYPE_STARLAN 11
+#define IF_TYPE_PROTEON_10MBIT 12
+#define IF_TYPE_PROTEON_80MBIT 13
+#define IF_TYPE_HYPERCHANNEL 14
+#define IF_TYPE_FDDI 15
+#define IF_TYPE_LAP_B 16
+#define IF_TYPE_SDLC 17
+#define IF_TYPE_DS1 18 /* DS1-MIB */
+#define IF_TYPE_E1 19 /* Obsolete; see DS1-MIB */
+#define IF_TYPE_BASIC_ISDN 20
+#define IF_TYPE_PRIMARY_ISDN 21
+#define IF_TYPE_PROP_POINT2POINT_SERIAL 22 /* proprietary serial */
+#define IF_TYPE_PPP 23
+#define IF_TYPE_SOFTWARE_LOOPBACK 24
+#define IF_TYPE_EON 25 /* CLNP over IP */
+#define IF_TYPE_ETHERNET_3MBIT 26
+#define IF_TYPE_NSIP 27 /* XNS over IP */
+#define IF_TYPE_SLIP 28 /* Generic Slip */
+#define IF_TYPE_ULTRA 29 /* ULTRA Technologies */
+#define IF_TYPE_DS3 30 /* DS3-MIB */
+#define IF_TYPE_SIP 31 /* SMDS, coffee */
+#define IF_TYPE_FRAMERELAY 32 /* DTE only */
+#define IF_TYPE_RS232 33
+#define IF_TYPE_PARA 34 /* Parallel port */
+#define IF_TYPE_ARCNET 35
+#define IF_TYPE_ARCNET_PLUS 36
+#define IF_TYPE_ATM 37 /* ATM cells */
+#define IF_TYPE_MIO_X25 38
+#define IF_TYPE_SONET 39 /* SONET or SDH */
+#define IF_TYPE_X25_PLE 40
+#define IF_TYPE_ISO88022_LLC 41
+#define IF_TYPE_LOCALTALK 42
+#define IF_TYPE_SMDS_DXI 43
+#define IF_TYPE_FRAMERELAY_SERVICE 44 /* FRNETSERV-MIB */
+#define IF_TYPE_V35 45
+#define IF_TYPE_HSSI 46
+#define IF_TYPE_HIPPI 47
+#define IF_TYPE_MODEM 48 /* Generic Modem */
+#define IF_TYPE_AAL5 49 /* AAL5 over ATM */
+#define IF_TYPE_SONET_PATH 50
+#define IF_TYPE_SONET_VT 51
+#define IF_TYPE_SMDS_ICIP 52 /* SMDS InterCarrier Interface */
+#define IF_TYPE_PROP_VIRTUAL 53 /* Proprietary virtual/internal */
+#define IF_TYPE_PROP_MULTIPLEXOR 54 /* Proprietary multiplexing */
+#define IF_TYPE_IEEE80212 55 /* 100BaseVG */
+#define IF_TYPE_FIBRECHANNEL 56
+#define IF_TYPE_HIPPIINTERFACE 57
+#define IF_TYPE_FRAMERELAY_INTERCONNECT 58 /* Obsolete, use 32 or 44 */
+#define IF_TYPE_AFLANE_8023 59 /* ATM Emulated LAN for 802.3 */
+#define IF_TYPE_AFLANE_8025 60 /* ATM Emulated LAN for 802.5 */
+#define IF_TYPE_CCTEMUL 61 /* ATM Emulated circuit */
+#define IF_TYPE_FASTETHER 62 /* Fast Ethernet (100BaseT) */
+#define IF_TYPE_ISDN 63 /* ISDN and X.25 */
+#define IF_TYPE_V11 64 /* CCITT V.11/X.21 */
+#define IF_TYPE_V36 65 /* CCITT V.36 */
+#define IF_TYPE_G703_64K 66 /* CCITT G703 at 64Kbps */
+#define IF_TYPE_G703_2MB 67 /* Obsolete; see DS1-MIB */
+#define IF_TYPE_QLLC 68 /* SNA QLLC */
+#define IF_TYPE_FASTETHER_FX 69 /* Fast Ethernet (100BaseFX) */
+#define IF_TYPE_CHANNEL 70
+#define IF_TYPE_IEEE80211 71 /* Radio spread spectrum */
+#define IF_TYPE_IBM370PARCHAN 72 /* IBM System 360/370 OEMI Channel */
+#define IF_TYPE_ESCON 73 /* IBM Enterprise Systems Connection */
+#define IF_TYPE_DLSW 74 /* Data Link Switching */
+#define IF_TYPE_ISDN_S 75 /* ISDN S/T interface */
+#define IF_TYPE_ISDN_U 76 /* ISDN U interface */
+#define IF_TYPE_LAP_D 77 /* Link Access Protocol D */
+#define IF_TYPE_IPSWITCH 78 /* IP Switching Objects */
+#define IF_TYPE_RSRB 79 /* Remote Source Route Bridging */
+#define IF_TYPE_ATM_LOGICAL 80 /* ATM Logical Port */
+#define IF_TYPE_DS0 81 /* Digital Signal Level 0 */
+#define IF_TYPE_DS0_BUNDLE 82 /* Group of ds0s on the same ds1 */
+#define IF_TYPE_BSC 83 /* Bisynchronous Protocol */
+#define IF_TYPE_ASYNC 84 /* Asynchronous Protocol */
+#define IF_TYPE_CNR 85 /* Combat Net Radio */
+#define IF_TYPE_ISO88025R_DTR 86 /* ISO 802.5r DTR */
+#define IF_TYPE_EPLRS 87 /* Ext Pos Loc Report Sys */
+#define IF_TYPE_ARAP 88 /* Appletalk Remote Access Protocol */
+#define IF_TYPE_PROP_CNLS 89 /* Proprietary Connectionless Proto */
+#define IF_TYPE_HOSTPAD 90 /* CCITT-ITU X.29 PAD Protocol */
+#define IF_TYPE_TERMPAD 91 /* CCITT-ITU X.3 PAD Facility */
+#define IF_TYPE_FRAMERELAY_MPI 92 /* Multiproto Interconnect over FR */
+#define IF_TYPE_X213 93 /* CCITT-ITU X213 */
+#define IF_TYPE_ADSL 94 /* Asymmetric Digital Subscrbr Loop */
+#define IF_TYPE_RADSL 95 /* Rate-Adapt Digital Subscrbr Loop */
+#define IF_TYPE_SDSL 96 /* Symmetric Digital Subscriber Loop */
+#define IF_TYPE_VDSL 97 /* Very H-Speed Digital Subscrb Loop */
+#define IF_TYPE_ISO88025_CRFPRINT 98 /* ISO 802.5 CRFP */
+#define IF_TYPE_MYRINET 99 /* Myricom Myrinet */
+#define IF_TYPE_VOICE_EM 100 /* Voice recEive and transMit */
+#define IF_TYPE_VOICE_FXO 101 /* Voice Foreign Exchange Office */
+#define IF_TYPE_VOICE_FXS 102 /* Voice Foreign Exchange Station */
+#define IF_TYPE_VOICE_ENCAP 103 /* Voice encapsulation */
+#define IF_TYPE_VOICE_OVERIP 104 /* Voice over IP encapsulation */
+#define IF_TYPE_ATM_DXI 105 /* ATM DXI */
+#define IF_TYPE_ATM_FUNI 106 /* ATM FUNI */
+#define IF_TYPE_ATM_IMA 107 /* ATM IMA */
+#define IF_TYPE_PPPMULTILINKBUNDLE 108 /* PPP Multilink Bundle */
+#define IF_TYPE_IPOVER_CDLC 109 /* IBM ipOverCdlc */
+#define IF_TYPE_IPOVER_CLAW 110 /* IBM Common Link Access to Workstn */
+#define IF_TYPE_STACKTOSTACK 111 /* IBM stackToStack */
+#define IF_TYPE_VIRTUALIPADDRESS 112 /* IBM VIPA */
+#define IF_TYPE_MPC 113 /* IBM multi-proto channel support */
+#define IF_TYPE_IPOVER_ATM 114 /* IBM ipOverAtm */
+#define IF_TYPE_ISO88025_FIBER 115 /* ISO 802.5j Fiber Token Ring */
+#define IF_TYPE_TDLC 116 /* IBM twinaxial data link control */
+#define IF_TYPE_GIGABITETHERNET 117
+#define IF_TYPE_HDLC 118
+#define IF_TYPE_LAP_F 119
+#define IF_TYPE_V37 120
+#define IF_TYPE_X25_MLP 121 /* Multi-Link Protocol */
+#define IF_TYPE_X25_HUNTGROUP 122 /* X.25 Hunt Group */
+#define IF_TYPE_TRANSPHDLC 123
+#define IF_TYPE_INTERLEAVE 124 /* Interleave channel */
+#define IF_TYPE_FAST 125 /* Fast channel */
+#define IF_TYPE_IP 126 /* IP (for APPN HPR in IP networks) */
+#define IF_TYPE_DOCSCABLE_MACLAYER 127 /* CATV Mac Layer */
+#define IF_TYPE_DOCSCABLE_DOWNSTREAM 128 /* CATV Downstream interface */
+#define IF_TYPE_DOCSCABLE_UPSTREAM 129 /* CATV Upstream interface */
+#define IF_TYPE_A12MPPSWITCH 130 /* Avalon Parallel Processor */
+#define IF_TYPE_TUNNEL 131 /* Encapsulation interface */
+#define IF_TYPE_COFFEE 132 /* Coffee pot */
+#define IF_TYPE_CES 133 /* Circuit Emulation Service */
+#define IF_TYPE_ATM_SUBINTERFACE 134 /* ATM Sub Interface */
+#define IF_TYPE_L2_VLAN 135 /* Layer 2 Virtual LAN using 802.1Q */
+#define IF_TYPE_L3_IPVLAN 136 /* Layer 3 Virtual LAN using IP */
+#define IF_TYPE_L3_IPXVLAN 137 /* Layer 3 Virtual LAN using IPX */
+#define IF_TYPE_DIGITALPOWERLINE 138 /* IP over Power Lines */
+#define IF_TYPE_MEDIAMAILOVERIP 139 /* Multimedia Mail over IP */
+#define IF_TYPE_DTM 140 /* Dynamic syncronous Transfer Mode */
+#define IF_TYPE_DCN 141 /* Data Communications Network */
+#define IF_TYPE_IPFORWARD 142 /* IP Forwarding Interface */
+#define IF_TYPE_MSDSL 143 /* Multi-rate Symmetric DSL */
+#define IF_TYPE_IEEE1394 144 /* IEEE1394 High Perf Serial Bus */
+#define IF_TYPE_RECEIVE_ONLY 145 /* TV adapter type */
+
#endif /* SIGHT_PRIVATE_H */
17 years, 6 months
JBoss Native SVN: r980 - trunk/sight/native/os/linux.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-09-06 05:13:02 -0400 (Thu, 06 Sep 2007)
New Revision: 980
Modified:
trunk/sight/native/os/linux/main.c
Log:
Fix copy/paste typo
Modified: trunk/sight/native/os/linux/main.c
===================================================================
--- trunk/sight/native/os/linux/main.c 2007-09-06 09:12:12 UTC (rev 979)
+++ trunk/sight/native/os/linux/main.c 2007-09-06 09:13:02 UTC (rev 980)
@@ -55,7 +55,6 @@
struct utsname uts;
sight_ticks_ms = 1000L / sysconf(_SC_CLK_TCK);
sight_ticks_us = 1000000L / sysconf(_SC_CLK_TCK);
- int major, minor, patch;
if (!uname(&uts)) {
if (sscanf(uts.release, "%d.%d.%d",
17 years, 6 months
JBoss Native SVN: r979 - trunk/sight/native/os/linux.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-09-06 05:12:12 -0400 (Thu, 06 Sep 2007)
New Revision: 979
Modified:
trunk/sight/native/os/linux/main.c
Log:
Detect Linux kernel version on startup
Modified: trunk/sight/native/os/linux/main.c
===================================================================
--- trunk/sight/native/os/linux/main.c 2007-09-06 06:26:43 UTC (rev 978)
+++ trunk/sight/native/os/linux/main.c 2007-09-06 09:12:12 UTC (rev 979)
@@ -30,11 +30,16 @@
#include "sight_types.h"
#include "sight_private.h"
#include <sys/sysinfo.h>
+#include <sys/utsname.h>
#include <unistd.h>
static apr_int64_t sight_ticks_ms = 0L;
static apr_int64_t sight_ticks_us = 0L;
+int kernel_major = 0;
+int kernel_minor = 0;
+int kernel_patch = 0;
+
apr_int64_t TCK2MS(apr_int64_t t)
{
return (t * sight_ticks_ms);
@@ -47,7 +52,18 @@
apr_status_t sight_main(apr_pool_t *pool)
{
+ struct utsname uts;
sight_ticks_ms = 1000L / sysconf(_SC_CLK_TCK);
sight_ticks_us = 1000000L / sysconf(_SC_CLK_TCK);
+ int major, minor, patch;
+
+ if (!uname(&uts)) {
+ if (sscanf(uts.release, "%d.%d.%d",
+ &kernel_major, &kernel_minor, &kernel_patch) != 3) {
+ kernel_major = 0;
+ kernel_minor = 0;
+ kernel_patch = 0;
+ }
+ }
return APR_SUCCESS;
}
17 years, 6 months
JBoss Native SVN: r978 - trunk/sight/native/os/windows.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-09-06 02:26:43 -0400 (Thu, 06 Sep 2007)
New Revision: 978
Modified:
trunk/sight/native/os/windows/network.c
Log:
Do not leek resources if exception occured
Modified: trunk/sight/native/os/windows/network.c
===================================================================
--- trunk/sight/native/os/windows/network.c 2007-09-05 16:10:30 UTC (rev 977)
+++ trunk/sight/native/os/windows/network.c 2007-09-06 06:26:43 UTC (rev 978)
@@ -130,8 +130,9 @@
idx = 0;
while (da) {
addr = sight_new_netaddr_class(_E, _O);
- if (!addr || (*_E)->ExceptionCheck(_E))
- return;
+ if (!addr || (*_E)->ExceptionCheck(_E)) {
+ goto cleanup;
+ }
sight_netaddr_set_addr(_E, addr, da->IpAddress.String);
sight_netaddr_set_family(_E, addr, AF_INET);
if (*da->IpMask.String)
@@ -145,7 +146,6 @@
}
cleanup:
- if(pInfo)
- free(pInfo);
+ SIGHT_FREE(pInfo);
}
17 years, 6 months
JBoss Native SVN: r977 - trunk/sight/native/share.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-09-05 12:10:30 -0400 (Wed, 05 Sep 2007)
New Revision: 977
Modified:
trunk/sight/native/share/jnu.c
Log:
Fix typo for RPC file systems
Modified: trunk/sight/native/share/jnu.c
===================================================================
--- trunk/sight/native/share/jnu.c 2007-09-05 16:07:30 UTC (rev 976)
+++ trunk/sight/native/share/jnu.c 2007-09-05 16:10:30 UTC (rev 977)
@@ -461,7 +461,7 @@
return SIGHT_FS_UNKNOWN;
break;
case 'R':
- if (memcmp(p, "PC", 3) == 0)
+ if (memcmp(p, "PC", 2) == 0)
return SIGHT_FS_RPC;
if (memcmp(p, "OMFS", 4) == 0)
return SIGHT_FS_ROMFS;
17 years, 6 months
JBoss Native SVN: r976 - trunk/sight/native/os/linux.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-09-05 12:07:30 -0400 (Wed, 05 Sep 2007)
New Revision: 976
Modified:
trunk/sight/native/os/linux/volume.c
Log:
Linux drive types update
Modified: trunk/sight/native/os/linux/volume.c
===================================================================
--- trunk/sight/native/os/linux/volume.c 2007-09-05 16:00:04 UTC (rev 975)
+++ trunk/sight/native/os/linux/volume.c 2007-09-05 16:07:30 UTC (rev 976)
@@ -216,8 +216,6 @@
SET_IFIELD_J(0006, thiz, sv.f_frsize * sv.f_blocks);
SET_IFIELD_J(0007, thiz, sv.f_frsize * sv.f_bfree);
}
- else
- SET_IFIELD_I(0003, thiz, -1);
if (hasmntopt(&ent, MNTOPT_RW))
flags |= SIGHT_READ_WRITE_VOLUME;
if (hasmntopt(&ent, MNTOPT_RO))
@@ -238,6 +236,12 @@
case SIGHT_FS_TMPFS:
CALL_METHOD1(0002, thiz, SIGHT_DRIVE_RAMDISK);
break;
+ case SIGHT_FS_NFS:
+ CALL_METHOD1(0002, thiz, SIGHT_DRIVE_REMOTE);
+ break;
+ case SIGHT_FS_USBFS:
+ CALL_METHOD1(0002, thiz, SIGHT_DRIVE_REMOVABLE);
+ break;
default:
CALL_METHOD1(0002, thiz, SIGHT_DRIVE_FIXED);
break;
17 years, 6 months
JBoss Native SVN: r975 - in trunk/sight: native/include and 1 other directories.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-09-05 12:00:04 -0400 (Wed, 05 Sep 2007)
New Revision: 975
Modified:
trunk/sight/java/org/jboss/sight/FileSystemType.java
trunk/sight/native/include/sight_types.h
trunk/sight/native/share/jnu.c
Log:
Added USB and RPC file systems
Modified: trunk/sight/java/org/jboss/sight/FileSystemType.java
===================================================================
--- trunk/sight/java/org/jboss/sight/FileSystemType.java 2007-09-05 15:29:18 UTC (rev 974)
+++ trunk/sight/java/org/jboss/sight/FileSystemType.java 2007-09-05 16:00:04 UTC (rev 975)
@@ -81,8 +81,14 @@
SYSFS( 21),
/** Temp filesystem */
TMPFS( 22),
- NONE( 23);
+ /** RPC filesystem */
+ RPC( 23),
+ /** USB filesystem */
+ USBFS( 24),
+ /** File system is mounted to nothing */
+ NONE( 25);
+
private int value;
private FileSystemType(int v)
{
Modified: trunk/sight/native/include/sight_types.h
===================================================================
--- trunk/sight/native/include/sight_types.h 2007-09-05 15:29:18 UTC (rev 974)
+++ trunk/sight/native/include/sight_types.h 2007-09-05 16:00:04 UTC (rev 975)
@@ -145,7 +145,9 @@
#define SIGHT_FS_PROC 20
#define SIGHT_FS_SYSFS 21
#define SIGHT_FS_TMPFS 22
-#define SIGHT_FS_NONE 23
+#define SIGHT_FS_RPC 23
+#define SIGHT_FS_USBFS 24
+#define SIGHT_FS_NONE 25
#define SIGHT_CASE_SENSITIVE_SEARCH 0x00000001
#define SIGHT_CASE_PRESERVED_NAMES 0x00000002
Modified: trunk/sight/native/share/jnu.c
===================================================================
--- trunk/sight/native/share/jnu.c 2007-09-05 15:29:18 UTC (rev 974)
+++ trunk/sight/native/share/jnu.c 2007-09-05 16:00:04 UTC (rev 975)
@@ -415,6 +415,10 @@
return SIGHT_FS_MSDOS;
if (memcmp(p, "FS", 2) == 0)
return SIGHT_FS_FFS;
+ else
+ return SIGHT_FS_UNKNOWN;
+ break;
+ case 'H':
if (memcmp(p, "PFS", 3) == 0)
return SIGHT_FS_HPFS;
else
@@ -457,6 +461,8 @@
return SIGHT_FS_UNKNOWN;
break;
case 'R':
+ if (memcmp(p, "PC", 3) == 0)
+ return SIGHT_FS_RPC;
if (memcmp(p, "OMFS", 4) == 0)
return SIGHT_FS_ROMFS;
if (memcmp(p, "AMFS", 4) == 0)
@@ -483,6 +489,8 @@
case 'U':
if (memcmp(p, "DF", 2) == 0)
return SIGHT_FS_UDF;
+ if (memcmp(p, "SBFS", 4) == 0)
+ return SIGHT_FS_USBFS;
else
return SIGHT_FS_UNKNOWN;
break;
17 years, 6 months
JBoss Native SVN: r974 - trunk/sight/native/share.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-09-05 11:29:18 -0400 (Wed, 05 Sep 2007)
New Revision: 974
Modified:
trunk/sight/native/share/jnu.c
Log:
Ident source
Modified: trunk/sight/native/share/jnu.c
===================================================================
--- trunk/sight/native/share/jnu.c 2007-09-05 15:19:36 UTC (rev 973)
+++ trunk/sight/native/share/jnu.c 2007-09-05 15:29:18 UTC (rev 974)
@@ -401,101 +401,101 @@
return SIGHT_FS_UNKNOWN;
break;
case 'E':
- if(memcmp(p, "XT2", 3) == 0)
+ if (memcmp(p, "XT2", 3) == 0)
return SIGHT_FS_EXT2;
- if(memcmp(p, "XT3", 3) == 0)
+ if (memcmp(p, "XT3", 3) == 0)
return SIGHT_FS_EXT3;
else
return SIGHT_FS_UNKNOWN;
break;
case 'F':
- if(memcmp(p, "AT32", 4) == 0)
+ if (memcmp(p, "AT32", 4) == 0)
return SIGHT_FS_VFAT;
- if(memcmp(p, "AT", 2) == 0)
+ if (memcmp(p, "AT", 2) == 0)
return SIGHT_FS_MSDOS;
- if(memcmp(p, "FS", 2) == 0)
+ if (memcmp(p, "FS", 2) == 0)
return SIGHT_FS_FFS;
- if(memcmp(p, "PFS", 3) == 0)
+ if (memcmp(p, "PFS", 3) == 0)
return SIGHT_FS_HPFS;
else
return SIGHT_FS_UNKNOWN;
break;
case 'I':
- if(memcmp(p, "SO9660", 6) == 0)
+ if (memcmp(p, "SO9660", 6) == 0)
return SIGHT_FS_ISO9660;
- if(memcmp(p, "SO_9660", 7) == 0)
+ if (memcmp(p, "SO_9660", 7) == 0)
return SIGHT_FS_ISO9660;
else
return SIGHT_FS_UNKNOWN;
break;
case 'J':
- if(memcmp(p, "FS", 2) == 0)
+ if (memcmp(p, "FS", 2) == 0)
return SIGHT_FS_JFS;
else
return SIGHT_FS_UNKNOWN;
break;
case 'M':
- if(memcmp(p, "SDOS", 4) == 0)
+ if (memcmp(p, "SDOS", 4) == 0)
return SIGHT_FS_MSDOS;
else
return SIGHT_FS_UNKNOWN;
break;
case 'N':
- if(memcmp(p, "FS", 2) == 0)
+ if (memcmp(p, "FS", 2) == 0)
return SIGHT_FS_NFS;
- if(memcmp(p, "TFS", 3) == 0)
+ if (memcmp(p, "TFS", 3) == 0)
return SIGHT_FS_NTFS;
- if(memcmp(p, "ONE", 3) == 0)
+ if (memcmp(p, "ONE", 3) == 0)
return SIGHT_FS_NONE;
else
return SIGHT_FS_UNKNOWN;
break;
case 'P':
- if(memcmp(p, "ROC", 3) == 0)
+ if (memcmp(p, "ROC", 3) == 0)
return SIGHT_FS_PROC;
else
return SIGHT_FS_UNKNOWN;
break;
case 'R':
- if(memcmp(p, "OMFS", 4) == 0)
+ if (memcmp(p, "OMFS", 4) == 0)
return SIGHT_FS_ROMFS;
- if(memcmp(p, "AMFS", 4) == 0)
+ if (memcmp(p, "AMFS", 4) == 0)
return SIGHT_FS_RAMFS;
- if(memcmp(p, "AISERFS", 7) == 0)
+ if (memcmp(p, "AISERFS", 7) == 0)
return SIGHT_FS_RAISERFS;
else
return SIGHT_FS_UNKNOWN;
break;
case 'S':
- if(memcmp(p, "FS", 2) == 0)
+ if (memcmp(p, "FS", 2) == 0)
return SIGHT_FS_SFS;
- if(memcmp(p, "YSFS", 4) == 0)
+ if (memcmp(p, "YSFS", 4) == 0)
return SIGHT_FS_SYSFS;
else
return SIGHT_FS_UNKNOWN;
break;
case 'T':
- if(memcmp(p, "MPFS", 4) == 0)
+ if (memcmp(p, "MPFS", 4) == 0)
return SIGHT_FS_TMPFS;
else
return SIGHT_FS_UNKNOWN;
break;
case 'U':
- if(memcmp(p, "DF", 2) == 0)
+ if (memcmp(p, "DF", 2) == 0)
return SIGHT_FS_UDF;
else
return SIGHT_FS_UNKNOWN;
break;
case 'V':
- if(memcmp(p, "FAT", 3) == 0)
+ if (memcmp(p, "FAT", 3) == 0)
return SIGHT_FS_VFAT;
else
return SIGHT_FS_UNKNOWN;
break;
case 'X':
- if(memcmp(p, "FS", 2) == 0)
+ if (memcmp(p, "FS", 2) == 0)
return SIGHT_FS_XFS;
- if(memcmp(p, "IAFS", 4) == 0)
+ if (memcmp(p, "IAFS", 4) == 0)
return SIGHT_FS_XIAFS;
else
return SIGHT_FS_UNKNOWN;
17 years, 6 months