September 2007 - jbossnative-commits

JBoss Native SVN: r973 - trunk/sight/native/os/linux.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-09-05 11:19:36 -0400 (Wed, 05 Sep 2007) New Revision: 973 Modified: trunk/sight/native/os/linux/volume.c Log: Linux drive types Modified: trunk/sight/native/os/linux/volume.c =================================================================== --- trunk/sight/native/os/linux/volume.c 2007-09-05 10:08:21 UTC (rev 972) +++ trunk/sight/native/os/linux/volume.c 2007-09-05 15:19:36 UTC (rev 973) @@ -205,9 +205,10 @@ return; if (getmntent_r(e->fp, &ent, buf, SIGHT_MBUFFER_LEN)) { int flags = 0; + int dtype = sight_get_fs_type(ent.mnt_type); SET_IFIELD_S(0000, thiz, ent.mnt_fsname); SET_IFIELD_S(0002, thiz, ent.mnt_dir); - CALL_METHOD1(0000, thiz, sight_get_fs_type(ent.mnt_type)); + CALL_METHOD1(0000, thiz, dtype); if (!statvfs(ent.mnt_dir, &sv)) { SET_IFIELD_I(0004, thiz, sv.f_bsize); @@ -217,12 +218,31 @@ } else SET_IFIELD_I(0003, thiz, -1); - if (strstr(ent.mnt_opts, "ro")) + if (hasmntopt(&ent, MNTOPT_RW)) + flags |= SIGHT_READ_WRITE_VOLUME; + if (hasmntopt(&ent, MNTOPT_RO)) flags |= SIGHT_READ_ONLY_VOLUME; - if (strstr(ent.mnt_opts, "rw")) - flags |= SIGHT_READ_WRITE_VOLUME; - - CALL_METHOD1(0001, thiz, flags); + if (hasmntopt(&ent, MNTOPT_SUID)) + flags |= SIGHT_SUID_VOLUME; + CALL_METHOD1(0001, thiz, flags); + switch (dtype) { + case SIGHT_FS_UNKNOWN: + CALL_METHOD1(0002, thiz, SIGHT_DRIVE_UNKNOWN); + break; + case SIGHT_FS_ISO9660: + CALL_METHOD1(0002, thiz, SIGHT_DRIVE_CDROM); + break; + case SIGHT_FS_DEV: + case SIGHT_FS_PROC: + case SIGHT_FS_SYSFS: + case SIGHT_FS_TMPFS: + CALL_METHOD1(0002, thiz, SIGHT_DRIVE_RAMDISK); + break; + default: + CALL_METHOD1(0002, thiz, SIGHT_DRIVE_FIXED); + break; + } + } }

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r972 - trunk/sight/native/os/linux.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-09-05 06:08:21 -0400 (Wed, 05 Sep 2007) New Revision: 972 Modified: trunk/sight/native/os/linux/volume.c Log: Linux volume size Modified: trunk/sight/native/os/linux/volume.c =================================================================== --- trunk/sight/native/os/linux/volume.c 2007-09-05 09:06:55 UTC (rev 971) +++ trunk/sight/native/os/linux/volume.c 2007-09-05 10:08:21 UTC (rev 972) @@ -34,7 +34,7 @@ #include <mntent.h> #include <sys/statfs.h> -#include <sys/vfs.h> +#include <sys/statvfs.h> /* * Network adapter implementation @@ -160,7 +160,7 @@ if (!(e = (volume_enum_t *)sight_calloc(_E, sizeof(volume_enum_t), THROW_FMARK))) { - return NULL; + return 0; } return P2J(e); } @@ -195,6 +195,7 @@ jlong handle) { struct mntent ent; + struct statvfs sv; char buf[SIGHT_MBUFFER_SIZ]; volume_enum_t *e = J2P(handle, volume_enum_t *); @@ -208,11 +209,19 @@ SET_IFIELD_S(0002, thiz, ent.mnt_dir); CALL_METHOD1(0000, thiz, sight_get_fs_type(ent.mnt_type)); + if (!statvfs(ent.mnt_dir, &sv)) { + SET_IFIELD_I(0004, thiz, sv.f_bsize); + SET_IFIELD_J(0005, thiz, sv.f_frsize * sv.f_bavail); + 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 (strstr(ent.mnt_opts, "ro")) flags |= SIGHT_READ_ONLY_VOLUME; if (strstr(ent.mnt_opts, "rw")) flags |= SIGHT_READ_WRITE_VOLUME; - + CALL_METHOD1(0001, thiz, flags); } }

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r971 - trunk/sight/native/os/linux.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-09-05 05:06:55 -0400 (Wed, 05 Sep 2007) New Revision: 971 Modified: trunk/sight/native/os/linux/volume.c Log: Linux volume flags Modified: trunk/sight/native/os/linux/volume.c =================================================================== --- trunk/sight/native/os/linux/volume.c 2007-09-05 08:34:08 UTC (rev 970) +++ trunk/sight/native/os/linux/volume.c 2007-09-05 09:06:55 UTC (rev 971) @@ -203,10 +203,17 @@ if (!e || !thiz) return; if (getmntent_r(e->fp, &ent, buf, SIGHT_MBUFFER_LEN)) { + int flags = 0; SET_IFIELD_S(0000, thiz, ent.mnt_fsname); - SET_IFIELD_S(0001, thiz, ent.mnt_type); SET_IFIELD_S(0002, thiz, ent.mnt_dir); CALL_METHOD1(0000, thiz, sight_get_fs_type(ent.mnt_type)); + + if (strstr(ent.mnt_opts, "ro")) + flags |= SIGHT_READ_ONLY_VOLUME; + if (strstr(ent.mnt_opts, "rw")) + flags |= SIGHT_READ_WRITE_VOLUME; + + CALL_METHOD1(0001, thiz, flags); } }

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r970 - in trunk/sight: native/include and 2 other directories.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-09-05 04:34:08 -0400 (Wed, 05 Sep 2007) New Revision: 970 Modified: trunk/sight/java/org/jboss/sight/FileSystemType.java trunk/sight/native/include/sight_types.h trunk/sight/native/os/linux/volume.c trunk/sight/native/share/jnu.c Log: Implement Linux Volume functions Modified: trunk/sight/java/org/jboss/sight/FileSystemType.java =================================================================== --- trunk/sight/java/org/jboss/sight/FileSystemType.java 2007-09-03 15:41:55 UTC (rev 969) +++ trunk/sight/java/org/jboss/sight/FileSystemType.java 2007-09-05 08:34:08 UTC (rev 970) @@ -72,7 +72,16 @@ /** RAM filesystem */ RAMFS( 17), /** Raiser filesystem */ - RAISERFS( 18); + RAISERFS( 18), + /** Device filesystem */ + DEV( 19), + /** Proc filesystem */ + PROC( 20), + /** Sys filesystem */ + SYSFS( 21), + /** Temp filesystem */ + TMPFS( 22), + NONE( 23); private int value; private FileSystemType(int v) Modified: trunk/sight/native/include/sight_types.h =================================================================== --- trunk/sight/native/include/sight_types.h 2007-09-03 15:41:55 UTC (rev 969) +++ trunk/sight/native/include/sight_types.h 2007-09-05 08:34:08 UTC (rev 970) @@ -141,8 +141,12 @@ #define SIGHT_FS_NFS 16 #define SIGHT_FS_RAMFS 17 #define SIGHT_FS_RAISERFS 18 +#define SIGHT_FS_DEV 19 +#define SIGHT_FS_PROC 20 +#define SIGHT_FS_SYSFS 21 +#define SIGHT_FS_TMPFS 22 +#define SIGHT_FS_NONE 23 - #define SIGHT_CASE_SENSITIVE_SEARCH 0x00000001 #define SIGHT_CASE_PRESERVED_NAMES 0x00000002 #define SIGHT_UNICODE_ON_DISK 0x00000004 Modified: trunk/sight/native/os/linux/volume.c =================================================================== --- trunk/sight/native/os/linux/volume.c 2007-09-03 15:41:55 UTC (rev 969) +++ trunk/sight/native/os/linux/volume.c 2007-09-05 08:34:08 UTC (rev 970) @@ -32,6 +32,10 @@ #define SIGHT_WANT_LATE_DLL #include "sight_private.h" +#include <mntent.h> +#include <sys/statfs.h> +#include <sys/vfs.h> + /* * Network adapter implementation */ @@ -140,23 +144,70 @@ sight_unload_class(_E, &_clazzn); } +typedef struct volume_enum_t { + int num_mounts; + FILE *fp; +} volume_enum_t; + /* Initialize volume enumeration */ SIGHT_EXPORT_DECLARE(jlong, Volume, enum0)(SIGHT_STDARGS, jlong pool) { - return 0; + volume_enum_t *e; + char buf[SIGHT_MBUFFER_SIZ]; + + UNREFERENCED_O; + if (!(e = (volume_enum_t *)sight_calloc(_E, + sizeof(volume_enum_t), + THROW_FMARK))) { + return NULL; + } + return P2J(e); } SIGHT_EXPORT_DECLARE(jint, Volume, enum1)(SIGHT_STDARGS, jlong handle) { - return 0; + struct mntent ent; + char buf[SIGHT_MBUFFER_SIZ]; + volume_enum_t *e = J2P(handle, volume_enum_t *); + + UNREFERENCED_O; + + if (!e) + return 0; + if (!(e->fp = setmntent(MOUNTED, "r"))) { + throwAprException(_E, apr_get_os_error()); + return 0; + } else { + e->num_mounts = 0; + while (getmntent_r(e->fp, &ent, buf, SIGHT_MBUFFER_LEN)) { + e->num_mounts++; + } + endmntent(e->fp); + e->fp = setmntent(MOUNTED, "r"); + return e->num_mounts; + } } SIGHT_EXPORT_DECLARE(void, Volume, enum2)(SIGHT_STDARGS, jobject thiz, jlong handle) { + struct mntent ent; + char buf[SIGHT_MBUFFER_SIZ]; + volume_enum_t *e = J2P(handle, volume_enum_t *); + + UNREFERENCED_O; + + if (!e || !thiz) + return; + if (getmntent_r(e->fp, &ent, buf, SIGHT_MBUFFER_LEN)) { + SET_IFIELD_S(0000, thiz, ent.mnt_fsname); + SET_IFIELD_S(0001, thiz, ent.mnt_type); + SET_IFIELD_S(0002, thiz, ent.mnt_dir); + CALL_METHOD1(0000, thiz, sight_get_fs_type(ent.mnt_type)); + } } SIGHT_EXPORT_DECLARE(jint, Volume, enum3)(SIGHT_STDARGS, @@ -170,4 +221,12 @@ SIGHT_EXPORT_DECLARE(void, Volume, enum4)(SIGHT_STDARGS, jlong handle) { + volume_enum_t *e = J2P(handle, volume_enum_t *); + + UNREFERENCED_STDARGS; + if (e) { + if (e->fp) + endmntent(e->fp); + free(e); + } } Modified: trunk/sight/native/share/jnu.c =================================================================== --- trunk/sight/native/share/jnu.c 2007-09-03 15:41:55 UTC (rev 969) +++ trunk/sight/native/share/jnu.c 2007-09-05 08:34:08 UTC (rev 970) @@ -394,6 +394,12 @@ else return SIGHT_FS_UNKNOWN; break; + case 'D': + if (memcmp(p, "EV", 2) == 0) + return SIGHT_FS_DEV; + else + return SIGHT_FS_UNKNOWN; + break; case 'E': if(memcmp(p, "XT2", 3) == 0) return SIGHT_FS_EXT2; @@ -439,9 +445,17 @@ return SIGHT_FS_NFS; if(memcmp(p, "TFS", 3) == 0) return SIGHT_FS_NTFS; + if(memcmp(p, "ONE", 3) == 0) + return SIGHT_FS_NONE; else return SIGHT_FS_UNKNOWN; break; + case 'P': + if(memcmp(p, "ROC", 3) == 0) + return SIGHT_FS_PROC; + else + return SIGHT_FS_UNKNOWN; + break; case 'R': if(memcmp(p, "OMFS", 4) == 0) return SIGHT_FS_ROMFS; @@ -455,9 +469,17 @@ case 'S': if(memcmp(p, "FS", 2) == 0) return SIGHT_FS_SFS; + if(memcmp(p, "YSFS", 4) == 0) + return SIGHT_FS_SYSFS; else return SIGHT_FS_UNKNOWN; break; + case 'T': + if(memcmp(p, "MPFS", 4) == 0) + return SIGHT_FS_TMPFS; + else + return SIGHT_FS_UNKNOWN; + break; case 'U': if(memcmp(p, "DF", 2) == 0) return SIGHT_FS_UDF;

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r969 - trunk/sight/native/os/solaris.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-09-03 11:41:55 -0400 (Mon, 03 Sep 2007) New Revision: 969 Modified: trunk/sight/native/os/solaris/console.c Log: Use Linux code: It works fine there also. Modified: trunk/sight/native/os/solaris/console.c =================================================================== --- trunk/sight/native/os/solaris/console.c 2007-09-03 08:38:36 UTC (rev 968) +++ trunk/sight/native/os/solaris/console.c 2007-09-03 15:41:55 UTC (rev 969) @@ -34,17 +34,247 @@ #include "sight_types.h" #include "sight_private.h" -SIGHT_EXPORT_DECLARE(jlong, Console, alloc0)(SIGHT_STDARGS) +/* If unistd.h defines _POSIX_VERSION, we conclude that we + * are on a POSIX system and have sigaction and termios. */ +#if defined(_POSIX_VERSION) + +# define SIGACTION +# if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY) +# define TERMIOS +# endif +#endif + +/* There are 5 types of terminal interface supported, + * TERMIO, TERMIOS, VMS, MSDOS and SGTTY + */ + +#if defined(__sgi) && !defined(TERMIOS) +# define TERMIOS +# undef TERMIO +# undef SGTTY +#endif + +#if defined(linux) && !defined(TERMIO) +# undef TERMIOS +# define TERMIO +# undef SGTTY +#endif + +#ifdef _LIBC +# undef TERMIOS +# define TERMIO +# undef SGTTY +#endif + +#if !defined(TERMIO) && !defined(TERMIOS) +# undef TERMIOS +# undef TERMIO +# define SGTTY +#endif + +#ifdef TERMIOS +# include <termios.h> +# define TTY_STRUCT struct termios +# define TTY_FLAGS c_lflag +# define TTY_get(tty,data) tcgetattr(tty,data) +# define TTY_set(tty,data) tcsetattr(tty,TCSANOW,data) +#endif + +#ifdef TERMIO +# include <termio.h> +# define TTY_STRUCT struct termio +# define TTY_FLAGS c_lflag +# define TTY_get(tty,data) ioctl(tty,TCGETA,data) +# define TTY_set(tty,data) ioctl(tty,TCSETA,data) +#endif + +#ifdef SGTTY +# include <sgtty.h> +# define TTY_STRUCT struct sgttyb +# define TTY_FLAGS sg_flags +# define TTY_get(tty,data) ioctl(tty,TIOCGETP,data) +# define TTY_set(tty,data) ioctl(tty,TIOCSETP,data) +#endif + +#if !defined(_LIBC) +# include <sys/ioctl.h> +#endif + +#ifndef NX509_SIG +# define NX509_SIG 32 +#endif + + +/* Define globals. They are protected by a lock */ +#ifdef SIGACTION +static struct sigaction savsig[NX509_SIG]; +#else +static void (*savsig[NX509_SIG])(int ); +#endif + +#define DEV_TTY "/dev/tty" + +static TTY_STRUCT tty_orig; +static TTY_STRUCT tty_new; + +static FILE *tty_in; +static FILE *tty_out; +static int is_a_tty; + +static volatile sig_atomic_t intr_signal; + +static void recsig(int i) { - UNREFERENCED_STDARGS; + intr_signal = i; +} + + +/* Internal functions to handle signals and act on them */ +static void pushsig(void) +{ + int i; +#ifdef SIGACTION + struct sigaction sa; + + memset(&sa, 0, sizeof sa); + sa.sa_handler = recsig; +#endif + + for (i = 1; i < NX509_SIG; i++) { +#ifdef SIGUSR1 + if (i == SIGUSR1) + continue; +#endif +#ifdef SIGUSR2 + if (i == SIGUSR2) + continue; +#endif +#ifdef SIGKILL + if (i == SIGKILL) /* We can't make any action on that. */ + continue; +#endif +#ifdef SIGACTION + sigaction(i, &sa, &savsig[i]); +#else + savsig[i] = signal(i, recsig); +#endif + } + +#ifdef SIGWINCH + signal(SIGWINCH, SIG_DFL); +#endif +} + +static void popsig(void) +{ + int i; + + for (i = 1; i < NX509_SIG; i++) { +#ifdef SIGUSR1 + if (i == SIGUSR1) + continue; +#endif +#ifdef SIGUSR2 + if (i == SIGUSR2) + continue; +#endif +#ifdef SIGACTION + sigaction(i, &savsig[i], NULL); +#else + signal(i, savsig[i]); +#endif + } +} + +typedef struct { + FILE *coni; + FILE *cono; + TTY_STRUCT ttyo; + TTY_STRUCT ttyn; + int is_a_tty; + int echo_char; +} sight_console_t; + +/* Internal functions to read a string without echoing */ +static void read_till_nl(FILE *in) +{ +#define SIZE 4 + char buf[SIZE+1]; + + do { + fgets(buf, SIZE, in); + } while (strchr(buf, '\n') == NULL); +} + +static int echo_console(sight_console_t *con, jboolean on) +{ + +#ifdef TTY_FLAGS + memcpy(&(con->ttyn), &(con->ttyo), sizeof(con->ttyo)); + if (on) { + con->ttyn.TTY_FLAGS |= ECHO; + } + else { + con->ttyn.TTY_FLAGS &= ~ECHO; + } +#endif + +#if defined(TTY_set) + if (con->is_a_tty && (TTY_set(fileno(con->coni), &(con->ttyn)) == -1)) { + return errno; + } +#endif return 0; } + +SIGHT_EXPORT_DECLARE(jlong, Console, alloc0)(SIGHT_STDARGS) +{ + sight_console_t *con; + UNREFERENCED_O; + + if (!(con = (sight_console_t *)calloc(1, sizeof(sight_console_t)))) { + throwAprMemoryException(_E, THROW_FMARK, + apr_get_os_error()); + return 0; + } + return P2J(con); +} + SIGHT_EXPORT_DECLARE(void, Console, open0)(SIGHT_STDARGS, jlong instance) { + sight_console_t *con = J2P(instance, sight_console_t *); UNREFERENCED_STDARGS; - UNREFERENCED(instance); + + if (!con) + return; + con->is_a_tty = 1; + if ((con->coni = fopen(DEV_TTY, "r")) == NULL) + con->coni = stdin; + if ((con->cono = fopen(DEV_TTY, "w")) == NULL) + con->cono = stdout; + + if (TTY_get(fileno(con->coni), &con->ttyo) == -1) { +#ifdef ENOTTY + if (errno == ENOTTY) + con->is_a_tty = 0; + else +#endif +#ifdef EINVAL + /* Ariel Glenn ariel(a)columbia.edu reports that solaris + * can return EINVAL instead. This should be ok + */ + if (errno == EINVAL) + con->is_a_tty = 0; + else +#endif + { + /* TODO: Trow an exception ? */ + return; + } + } + } SIGHT_EXPORT_DECLARE(jint, Console, attach0)(SIGHT_STDARGS, @@ -52,22 +282,49 @@ { UNREFERENCED_STDARGS; UNREFERENCED(pid); - return APR_ENOTIMPL; + return APR_SUCCESS; } SIGHT_EXPORT_DECLARE(void, Console, close0)(SIGHT_STDARGS, jlong instance) { + sight_console_t *con = J2P(instance, sight_console_t *); + UNREFERENCED_STDARGS; + + if (!con) + return; + if (con->coni && con->echo_char) { + +#ifdef TTY_FLAGS + memcpy(&(con->ttyn), &(con->ttyo), sizeof(con->ttyo)); + con->ttyn.TTY_FLAGS |= ECHO; +#endif + +#if defined(TTY_set) + if (con->is_a_tty && (TTY_set(fileno(con->coni), &(con->ttyn)) == -1)) { + /* TODO: Do we need throw on error here? */ + } +#endif + } + if (con->coni && con->coni != stdin) + fclose(con->coni); + if (con->cono && con->cono != stdout) + fclose(con->cono); + free(con); } SIGHT_EXPORT_DECLARE(void, Console, echo0)(SIGHT_STDARGS, jlong instance, jboolean on) { + sight_console_t *con = J2P(instance, sight_console_t *); UNREFERENCED_STDARGS; - UNREFERENCED(instance); - UNREFERENCED(on); + + if (on) + con->echo_char = 0; + else + con->echo_char = '*'; } SIGHT_EXPORT_DECLARE(void, Console, stitle0)(SIGHT_STDARGS, @@ -87,48 +344,131 @@ { UNREFERENCED_STDARGS; + kill(getpid(), SIGQUIT); } SIGHT_EXPORT_DECLARE(jstring, Console, gets0)(SIGHT_STDARGS, jlong instance) { - UNREFERENCED_STDARGS; - UNREFERENCED(instance); - return NULL; + sight_console_t *con = J2P(instance, sight_console_t *); + static int ps; + char buff[SIGHT_HBUFFER_SIZ]; + char *p; + jstring rv = NULL; + + UNREFERENCED_O; + if (!con) { + return NULL; + } + + fflush(stdout); + ps = 0; + pushsig(); + ps = 1; + if (con->echo_char && echo_console(con, JNI_FALSE)) + goto cleanup; + ps = 2; + p = fgets(buff, SIGHT_HBUFFER_LEN, con->coni); + if (!p) + goto cleanup; + + if (feof(con->coni)) { + goto cleanup; + } + if (ferror(con->coni)) { + throwAprIOException(_E, apr_get_os_error()); + goto cleanup; + } + if ((p = (char *)strchr(buff, '\n')) != NULL) + *p = '\0'; + else + read_till_nl(con->coni); + + rv = CSTR_TO_JSTRING(buff); + +cleanup: + if (intr_signal == SIGINT) { + + /* TODO: Throw some exception */ + } + if (ps >= 2 && con->echo_char) + echo_console(con, JNI_TRUE); + if (ps >= 1) + popsig(); + return rv; } SIGHT_EXPORT_DECLARE(jint, Console, getc0)(SIGHT_STDARGS, jlong instance) { - UNREFERENCED_STDARGS; - UNREFERENCED(instance); - return -1; + sight_console_t *con = J2P(instance, sight_console_t *); + int ch; + static int ps; + UNREFERENCED_O; + if (!con) { + return -1; + } + + ps = 0; + pushsig(); + ps = 1; + if (con->echo_char && echo_console(con, JNI_FALSE)) + goto cleanup; + ps = 2; + + ch = fgetc(con->coni); + if (ch == -1) { + if (ferror(con->coni)) { + throwAprIOException(_E, apr_get_os_error()); + } + } + + if (intr_signal == SIGINT) { + /* TODO: Throw some exception */ + ch = -1; + } + +cleanup: + if (ps >= 2 && con->echo_char) + echo_console(con, JNI_TRUE); + if (ps >= 1) + popsig(); + return ch; } SIGHT_EXPORT_DECLARE(void, Console, putc0)(SIGHT_STDARGS, jlong instance, jint ch) { + sight_console_t *con = J2P(instance, sight_console_t *); UNREFERENCED_STDARGS; - UNREFERENCED(instance); - UNREFERENCED(ch); + if (con->cono) { + fputc(ch, con->cono); + } } SIGHT_EXPORT_DECLARE(void, Console, flush0)(SIGHT_STDARGS, jlong instance) { + sight_console_t *con = J2P(instance, sight_console_t *); + if (con->cono) + fflush(con->cono); UNREFERENCED_STDARGS; - UNREFERENCED(instance); } SIGHT_EXPORT_DECLARE(void, Console, puts0)(SIGHT_STDARGS, jlong instance, jstring str) { - UNREFERENCED_STDARGS; - UNREFERENCED(instance); - UNREFERENCED(str); + sight_console_t *con = J2P(instance, sight_console_t *); + SIGHT_ALLOC_CSTRING(str); + + UNREFERENCED_O; + if (con->cono) { + fputs(J2S(str), con->cono); + } + SIGHT_FREE_CSTRING(str); } @@ -137,7 +477,7 @@ { UNREFERENCED_STDARGS; UNREFERENCED(instance); - return APR_ENOTIMPL; + return APR_SUCCESS; } SIGHT_EXPORT_DECLARE(void, Console, ddisable0)(SIGHT_STDARGS,

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r968 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-09-03 04:38:36 -0400 (Mon, 03 Sep 2007) New Revision: 968 Modified: trunk/build/unix/build.sh Log: Add a usage error message. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2007-09-03 08:31:47 UTC (rev 967) +++ trunk/build/unix/build.sh 2007-09-03 08:38:36 UTC (rev 968) @@ -69,6 +69,7 @@ ;; *) echo "Parameter $1 not supported" + echo "Usage build.sh [-ssl|-cache|-static] [version] [package_name]" exit 1 ;; esac

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r967 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-09-03 04:31:47 -0400 (Mon, 03 Sep 2007) New Revision: 967 Modified: trunk/build/unix/build.sh trunk/build/unix/package.list Log: Allow a backup URL (archive.apache.org for example). Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2007-09-03 08:22:55 UTC (rev 966) +++ trunk/build/unix/build.sh 2007-09-03 08:31:47 UTC (rev 967) @@ -267,10 +267,19 @@ # Download the sources. It guess how to do it. # $1: URL. +# $1: Back URL. (archive for apache) downloadtaredsrc() { URL=$1 + URLBACK=$2 + if [ -z $URLBACK ]; then + URLBACK=$URL + fi wget --tries=0 --retry-connrefused $URL + if [ $? -ne 0 ]; then + echo "downloadtaredsrc Retrying on $URLBACK" + wget --tries=0 --retry-connrefused $URLBACK + fi fname=`basename $URL` case ${fname} in *.tar.gz) @@ -568,13 +577,15 @@ # Check and download # $1 directory of the checkout directory # $2 url for the download +# $3 backup url for the download ckeckdownload() { src_dir=$1 src_url=$2 + src_url_back=$3 cd $build_cache_dir if [ ! -d ${src_dir} ]; then - downloadtaredsrc $src_url + downloadtaredsrc $src_url $src_url_back applypatch $src_dir fi cp -rp ${src_dir} ${package_src_dir}/srclib @@ -585,19 +596,23 @@ if $BUILD_WIN ; then APRURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${apr_ver... APUURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-util-${ap... + APRURLBACK=http://archive.apache.org/dist/apr/apr-${apu_version}-win32-sr... + APUURLBACK=http://archive.apache.org/dist/apr/apr-util-${apu_version}-win... else APRURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${apr_ver... APUURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-util-${ap... + APRURLBACK=http://archive.apache.org/dist/apr/apr-${apr_version}.tar.gz + APUURLBACK=http://archive.apache.org/dist/apr/apr-util-${apu_version}.tar.gz fi SSLURL=http://www.openssl.org/source/openssl-${ssl_version}.tar.gz rm -rf ${package_src_dir} mkdir -p ${package_src_dir}/srclib -ckeckdownload apr-${apr_version} $APRURL -ckeckdownload apr-util-${apu_version} $APUURL +ckeckdownload apr-${apr_version} $APRURL $APRURLBACK +ckeckdownload apr-util-${apu_version} $APUURL $APUURLBACK if $has_openssl; then - ckeckdownload openssl-${ssl_version} $SSLURL + ckeckdownload openssl-${ssl_version} $SSLURL "" fi # Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2007-09-03 08:22:55 UTC (rev 966) +++ trunk/build/unix/package.list 2007-09-03 08:31:47 UTC (rev 967) @@ -1,4 +1,7 @@ # list of the packages # add new versions of package after existing ones. -jboss-native|2.0.2|1.2.8|1.2.8|0.9.8e|TOMCAT_NATIVE_1_1_11 -jboss-sight|1.0.0|1.2.8|1.2.8||trunk +jboss-native|2.0.2|1.2.9|1.2.8|0.9.8e|TOMCAT_NATIVE_1_1_11 +jboss-native|2.0.3|1.2.8|1.2.8|0.9.8e|TOMCAT_NATIVE_1_1_11 +# SIGHT +jboss-sight|1.0.0|1.2.9|1.2.8||trunk +jboss-sight|1.0.1|1.2.8|1.2.8||trunk

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r966 - trunk/sight/native/share.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-09-03 04:22:55 -0400 (Mon, 03 Sep 2007) New Revision: 966 Modified: trunk/sight/native/share/jnu.c Log: Fix JBNATIVE-43. We compare >= 0 and we cannot do that with size_t that is unsigned. Modified: trunk/sight/native/share/jnu.c =================================================================== --- trunk/sight/native/share/jnu.c 2007-09-03 07:01:53 UTC (rev 965) +++ trunk/sight/native/share/jnu.c 2007-09-03 08:22:55 UTC (rev 966) @@ -118,11 +118,11 @@ char *sight_rtrim(char *s) { - size_t i; + int i; /* check for empty strings */ if (!s || !*s) return NULL; - for (i = strlen(s) - 1; i >= 0 && (apr_iscntrl(s[i]) || + for (i = (int)strlen(s) - 1; i >= 0 && (apr_iscntrl(s[i]) || apr_isspace(s[i])); i--) ; s[i + 1] = '\0'; @@ -134,7 +134,7 @@ char *sight_ltrim(char *s) { - size_t i; + int i; /* check for empty strings */ if (!s || !*s) return NULL; @@ -149,11 +149,11 @@ char *sight_trim(char *s) { - size_t i; + int i; /* check for empty strings */ if (!s || !*s) return NULL; - for (i = strlen(s) - 1; i >= 0 && (apr_iscntrl(s[i]) || + for (i = (int)strlen(s) - 1; i >= 0 && (apr_iscntrl(s[i]) || apr_isspace(s[i])); i--) ; s[i + 1] = '\0';

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r965 - trunk/sight/native/share.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-09-03 03:01:53 -0400 (Mon, 03 Sep 2007) New Revision: 965 Modified: trunk/sight/native/share/jnu.c Log: Fix typo Modified: trunk/sight/native/share/jnu.c =================================================================== --- trunk/sight/native/share/jnu.c 2007-09-03 06:47:03 UTC (rev 964) +++ trunk/sight/native/share/jnu.c 2007-09-03 07:01:53 UTC (rev 965) @@ -226,7 +226,7 @@ if (rd > 0) { /* Remove all trailing zero and space characters */ - for (rd = i - 1; i >= 0 && (apr_iscntrl(b[i]) || + for (i = rd - 1; i >= 0 && (apr_iscntrl(b[i]) || apr_isspace(b[i])); i--) ; b[i + 1] = '\0';

17 years, 4 months

1
0
0 / 0

JBoss Native SVN: r964 - trunk/sight/native/os/windows.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-09-03 02:47:03 -0400 (Mon, 03 Sep 2007) New Revision: 964 Modified: trunk/sight/native/os/windows/utils.c Log: Make trim functions return NULL for empty trimmed strings. Modified: trunk/sight/native/os/windows/utils.c =================================================================== --- trunk/sight/native/os/windows/utils.c 2007-09-03 06:43:20 UTC (rev 963) +++ trunk/sight/native/os/windows/utils.c 2007-09-03 06:47:03 UTC (rev 964) @@ -36,7 +36,7 @@ /* check for empty strings */ if (!s || !*s) - return s; + return NULL; i = lstrlenW(s) - 1; while (i >= 0 && (iswspace(s[i]) || (s[i] == L'\r') || (s[i] == L'\n'))) s[i--] = L'\0';

17 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits September 2007