src/java.base/windows/native/libjli/java_md.c

rev 11654 : imported patch libjli

*** 105,115 ****
   * Returns NULL if the argument does not contains the parameter.
   * e.g.:
   * GetParamValue("theParam", "theParam=value") returns pointer to "value".
   */
  const char * GetParamValue(const char *paramName, const char *arg) {
!     int nameLen = JLI_StrLen(paramName);
      if (JLI_StrNCmp(paramName, arg, nameLen) == 0) {
          /* arg[nameLen] is valid (may contain final NULL) */
          if (arg[nameLen] == '=') {
              return arg + nameLen + 1;
          }
--- 105,115 ----
   * Returns NULL if the argument does not contains the parameter.
   * e.g.:
   * GetParamValue("theParam", "theParam=value") returns pointer to "value".
   */
  const char * GetParamValue(const char *paramName, const char *arg) {
!     size_t nameLen = JLI_StrLen(paramName);
      if (JLI_StrNCmp(paramName, arg, nameLen) == 0) {
          /* arg[nameLen] is valid (may contain final NULL) */
          if (arg[nameLen] == '=') {
              return arg + nameLen + 1;
          }
*** 559,569 ****
      va_end(vl);
      /* force a null terminator, if something is amiss */
      if (rc < 0) {
          /* apply ansi semantics */
          buffer[size - 1] = '\0';
!         return size;
      } else if (rc == size) {
          /* force a null terminator */
          buffer[size - 1] = '\0';
      }
      return rc;
--- 559,569 ----
      va_end(vl);
      /* force a null terminator, if something is amiss */
      if (rc < 0) {
          /* apply ansi semantics */
          buffer[size - 1] = '\0';
!         return (int)size;
      } else if (rc == size) {
          /* force a null terminator */
          buffer[size - 1] = '\0';
      }
      return rc;
*** 726,740 ****
          FreeLibrary(hSplashLib);
          hSplashLib = NULL;
      }
  }
  
- const char *
- jlong_format_specifier() {
-     return "%I64d";
- }
- 
  /*
   * Block current thread and continue execution in a new thread
   */
  int
  ContinueInNewThread0(int (JNICALL *continuation)(void *), jlong stack_size, void * args) {
--- 726,735 ----
*** 880,890 ****
      int result = -1;
      /* load AWT library once (if several preload function should be called) */
      if (hPreloadAwt == NULL) {
          /* awt.dll is not loaded yet */
          char libraryPath[MAXPATHLEN];
!         int jrePathLen = 0;
          HMODULE hJava = NULL;
          HMODULE hVerify = NULL;
  
          while (1) {
              /* awt.dll depends on jvm.dll & java.dll;
--- 875,885 ----
      int result = -1;
      /* load AWT library once (if several preload function should be called) */
      if (hPreloadAwt == NULL) {
          /* awt.dll is not loaded yet */
          char libraryPath[MAXPATHLEN];
!         size_t jrePathLen = 0;
          HMODULE hJava = NULL;
          HMODULE hVerify = NULL;
  
          while (1) {
              /* awt.dll depends on jvm.dll & java.dll;
*** 1002,1012 ****
   * (unquoted) argument containing a glob character(s) ie. * or ?
   */
  jobjectArray
  CreateApplicationArgs(JNIEnv *env, char **strv, int argc)
  {
!     int i, j, idx, tlen;
      jobjectArray outArray, inArray;
      char *ostart, *astart, **nargv;
      jboolean needs_expansion = JNI_FALSE;
      jmethodID mid;
      int stdargc;
--- 997,1008 ----
   * (unquoted) argument containing a glob character(s) ie. * or ?
   */
  jobjectArray
  CreateApplicationArgs(JNIEnv *env, char **strv, int argc)
  {
!     int i, j, idx;
!     size_t tlen;
      jobjectArray outArray, inArray;
      char *ostart, *astart, **nargv;
      jboolean needs_expansion = JNI_FALSE;
      jmethodID mid;
      int stdargc;