diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..0c0c338
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..b268ef3
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index eb81c22..654045d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,18 +4,16 @@
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..7e340a7
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a44d119..17bc113 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,16 +1,16 @@
-
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 041765a..b7d494c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,6 @@ apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 31
- buildToolsVersion "30.0.2"
defaultConfig {
applicationId "de.csicar.ning"
minSdkVersion 23
@@ -24,6 +23,7 @@ android {
buildFeatures {
viewBinding true
}
+ namespace 'de.csicar.ning'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 657ba57..9a9a826 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
+ xmlns:tools="http://schemas.android.com/tools">
diff --git a/app/src/main/java/de/csicar/ning/Dao.kt b/app/src/main/java/de/csicar/ning/Dao.kt
index dec7651..3665406 100644
--- a/app/src/main/java/de/csicar/ning/Dao.kt
+++ b/app/src/main/java/de/csicar/ning/Dao.kt
@@ -114,7 +114,7 @@ interface PortDao {
fun insert(port: Port): Long
@Transaction
- suspend fun upsert(port: Port): Long {
+ fun upsert(port: Port): Long {
val portFromDB = getPortFromNumber(port.deviceId, port.port) ?: return insert(port)
update(Port(portFromDB.portId, port.port, port.protocol, port.deviceId))
@@ -135,7 +135,7 @@ interface PortDao {
@Dao
interface ScanDao {
@Insert
- suspend fun insert(scan: Scan): Long
+ fun insert(scan: Scan): Long
@Query("Select * FROM SCAN")
fun getAll(): LiveData>
diff --git a/app/src/main/java/de/csicar/ning/DeviceInfoFragment.kt b/app/src/main/java/de/csicar/ning/DeviceInfoFragment.kt
index 8eeb2dd..73ea26d 100644
--- a/app/src/main/java/de/csicar/ning/DeviceInfoFragment.kt
+++ b/app/src/main/java/de/csicar/ning/DeviceInfoFragment.kt
@@ -3,16 +3,16 @@ package de.csicar.ning
import android.content.Intent
import android.net.Uri
import android.os.Bundle
+import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Button
+import android.widget.ProgressBar
import android.widget.TextView
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import de.csicar.ning.scanner.PortScanner
import de.csicar.ning.ui.RecyclerViewCommon
@@ -20,6 +20,9 @@ import de.csicar.ning.util.AppPreferences
import de.csicar.ning.util.CopyUtil
//import kotlinx.android.synthetic.main.fragment_port_item.view.*
import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
@@ -30,6 +33,10 @@ import kotlinx.coroutines.withContext
* [DeviceInfoFragment.OnListFragmentInteractionListener] interface.
*/
class DeviceInfoFragment : Fragment() {
+ companion object {
+ val TAG: String = DeviceInfoFragment::class.java.name
+ }
+
val viewModel: ScanViewModel by activityViewModels()
lateinit var scanAllPortsButton: Button
@@ -47,6 +54,7 @@ class DeviceInfoFragment : Fragment() {
val deviceNameTextView = view.findViewById(R.id.deviceNameTextView)
val deviceHwAddressTextView = view.findViewById(R.id.deviceHwAddressTextView)
val deviceVendorTextView = view.findViewById(R.id.deviceVendorTextView)
+ val portScanProgressBar = view.findViewById(R.id.portScanProgressBar)
copyUtil.makeTextViewCopyable((deviceTypeTextView))
copyUtil.makeTextViewCopyable((deviceIpTextView))
@@ -54,8 +62,10 @@ class DeviceInfoFragment : Fragment() {
copyUtil.makeTextViewCopyable(deviceHwAddressTextView)
copyUtil.makeTextViewCopyable(deviceVendorTextView)
- viewModel.deviceDao.getById(argumentDeviceId).observe(this, Observer {
- fetchInfo(it.asDevice)
+ viewModel.deviceDao.getById(argumentDeviceId).observe(viewLifecycleOwner, Observer {
+ fetchCommonPorts(it.asDevice) { progress ->
+ portScanProgressBar.progress = (progress * 1000).toInt()
+ }
deviceTypeTextView.text = getString(it.deviceType.label)
deviceIpTextView.text = it.ip.hostAddress
deviceNameTextView.text = if (it.isScanningDevice) {
@@ -70,7 +80,18 @@ class DeviceInfoFragment : Fragment() {
val ports = viewModel.portDao.getAllForDevice(argumentDeviceId)
- recyclerView.setHandler(context!!, this, object :
+ this.scanAllPortsButton = view.findViewById(R.id.scanAllPorts)
+
+ this.scanAllPortsButton.setOnClickListener {
+ viewModel.viewModelScope.launch(context = Dispatchers.IO) {
+ Log.d(TAG, "scan all ports")
+ fetchAllPorts(viewModel.deviceDao.getByIdNow(argumentDeviceId)) {
+ portScanProgressBar.progress = (it * 1000).toInt()
+ }
+ }
+ }
+
+ recyclerView.setHandler(requireContext(), this, object :
RecyclerViewCommon.Handler(R.layout.fragment_port_item, ports) {
override fun shareIdentity(a: Port, b: Port) = a.port == b.port
override fun areContentsTheSame(a: Port, b: Port) = a == b
@@ -118,12 +139,40 @@ class DeviceInfoFragment : Fragment() {
return view
}
- fun fetchInfo(device: Device) {
+ private fun fetchAllPorts(device: Device, onProgress: (Double) -> Unit) {
+ viewModel.viewModelScope.launch {
+ withContext(Dispatchers.IO) {
+ Log.d(TAG, "fetchAllPort")
+ val portScans = PortScanner(device.ip).scanAllPorts()
+ var currentProgress = 0.0
+
+ portScans.onEach {
+ currentProgress += it.progressPortion
+ Log.d(TAG, "from progress scan $it ($currentProgress)")
+ onProgress(currentProgress)
+ }.collect { result: PortScanner.PortResult ->
+ if (result.isOpen) {
+ viewModel.portDao.upsert(
+ Port(0, result.port, result.protocol, device.deviceId)
+ )
+ }
+ }
+ }
+ }
+ }
+
+ private fun fetchCommonPorts(device: Device, onProgress: (Double) -> Unit) {
viewModel.viewModelScope.launch {
withContext(Dispatchers.IO) {
- PortScanner(device.ip).scanPorts().forEach {
+ val portScans = PortScanner(device.ip).scanCommonPorts()
+ var currentProgress = 0.0
+ portScans.forEach {
launch {
val result = it.await()
+
+ currentProgress += 1.0 / portScans.size
+ onProgress(currentProgress)
+
if (result.isOpen) {
viewModel.portDao.upsert(
Port(
diff --git a/app/src/main/java/de/csicar/ning/scanner/PortScanner.kt b/app/src/main/java/de/csicar/ning/scanner/PortScanner.kt
index 233a961..ead8813 100644
--- a/app/src/main/java/de/csicar/ning/scanner/PortScanner.kt
+++ b/app/src/main/java/de/csicar/ning/scanner/PortScanner.kt
@@ -1,12 +1,18 @@
package de.csicar.ning.scanner
import android.util.Log
+import de.csicar.ning.DeviceInfoFragment
import de.csicar.ning.Port
import de.csicar.ning.PortDescription
import de.csicar.ning.Protocol
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.asFlow
+import kotlinx.coroutines.flow.flatMapConcat
+import kotlinx.coroutines.flow.flatMapMerge
+import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.withContext
import java.io.IOException
import java.io.InterruptedIOException
@@ -48,24 +54,39 @@ class PortScanner(val ip: InetAddress) {
return@withContext false
} catch (ex: NoRouteToHostException) {
Log.d(TAG, "No Route to Host: $ex")
- return@withContext false
+ return@withContext false
} finally {
socket?.close()
}
}
- suspend fun scanPorts() = withContext(Dispatchers.Main) {
- PortDescription.commonPorts.flatMap {
- listOf(
- async {
- PortResult(it.port, Protocol.TCP, isTcpPortOpen(it.port))
- },
- async {
- PortResult(it.port, Protocol.UDP, isUdpPortOpen(it.port))
- }
- )
+ suspend fun scanAllPorts(): Flow {
+ val range = (1..65535)
+ return range.asFlow().flatMapMerge(concurrency = 128) {
+ Log.d(DeviceInfoFragment.TAG, "scan port $it")
+ flow {
+ emit(PortResult(it, Protocol.TCP, isTcpPortOpen(it), 1.0 / range.count()))
+ emit(PortResult(it, Protocol.UDP, isUdpPortOpen(it), 1.0 / range.count()))
+ }
+ }
+ }
+
+
+ suspend fun scanCommonPorts() = withContext(Dispatchers.Main) {
+ val ports = PortDescription.commonPorts
+ ports.flatMap {
+ listOf(async {
+ PortResult(it.port, Protocol.TCP, isTcpPortOpen(it.port), 1.0 / ports.count())
+ }, async {
+ PortResult(it.port, Protocol.UDP, isUdpPortOpen(it.port), 1.0 / ports.count())
+ })
}
}
- data class PortResult(val port: Int, val protocol: Protocol, val isOpen: Boolean)
+ data class PortResult(
+ val port: Int,
+ val protocol: Protocol,
+ val isOpen: Boolean,
+ val progressPortion: Double
+ )
}
diff --git a/app/src/main/res/layout/fragment_deviceinfo_list.xml b/app/src/main/res/layout/fragment_deviceinfo_list.xml
index 27c6ec9..aa8ccaa 100644
--- a/app/src/main/res/layout/fragment_deviceinfo_list.xml
+++ b/app/src/main/res/layout/fragment_deviceinfo_list.xml
@@ -144,6 +144,13 @@
android:text="@string/title_open_ports"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
+
+ tools:listitem="@layout/fragment_port_item">
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0fa306d..480b11a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,4 +29,5 @@
Cast
Unknown
Home Appliance
+ more Ports...
diff --git a/app/src/test/java/de/csicar/ning/scanner/PortScannerTest.kt b/app/src/test/java/de/csicar/ning/scanner/PortScannerTest.kt
new file mode 100644
index 0000000..58a3538
--- /dev/null
+++ b/app/src/test/java/de/csicar/ning/scanner/PortScannerTest.kt
@@ -0,0 +1,5 @@
+package de.csicar.ning.scanner
+
+import org.junit.jupiter.api.Assertions.*
+
+class PortScannerTest
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 25b9dc1..2e500fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.5.31'
+ ext.kotlin_version = '1.6.21'
repositories {
google()
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.0.3'
+ classpath 'com.android.tools.build:gradle:8.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
index 23339e0..9e73ebc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,3 +19,6 @@ android.useAndroidX=true
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf..7454180 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0aeba1a..17655d0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Jan 03 16:38:50 CET 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
diff --git a/gradlew b/gradlew
index b0d6d0a..1b6c787 100755
--- a/gradlew
+++ b/gradlew
@@ -1,13 +1,13 @@
-#!/usr/bin/env sh
+#!/bin/sh
#
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,78 +17,113 @@
#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
# Attempt to set APP_HOME
+
# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
warn () {
echo "$*"
-}
+} >&2
die () {
echo
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -105,84 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
fi
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
fi
- i=$((i+1))
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
done
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 15e1ee3..ac1b06f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -5,7 +5,7 @@
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
-@rem http://www.apache.org/licenses/LICENSE-2.0
+@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell