-## Echo if whatif flag is specified but not quiet flag
+## Echo if both conditions are met:
+## 1. whatif flag is specified (whatif=1)
+## 2. quiet flag is not specified (quiet!=1)

-check_clang-format()
+check_clang_format()
 {
-    # First check explicitly for the clang-format-7 executable.
-    cf=$(command -v clang-format-7 2> /dev/null)
-
-    if [[ -x ${cf} ]]; then
-        cf="clang-format-7"
-        return
-    else
-        cf=$(command -v clang-format 2> /dev/null)
-        if [[ ! -x ${cf} ]]; then
-            echo "clang-format is not installed"
-            exit 1
-        fi
-        cf="clang-format"
-    fi
+    cf=$(command -v clang-format 2> /dev/null)
+    if [[ ! -x ${cf} ]]; then
+        echo "clang-format is not installed"
+        exit 1
+    fi
+    cf="clang-format"

     local required_cfver='17.0.3'
     # shellcheck disable=SC2155
     local cfver=$(${cf} --version | grep -o -E '[0-9]+\.[0-9]+\.[0-9]+' | head -1)
-    check_version "${required_cfver}" "${cfver}"
+    if ! check_version "${required_cfver}" "${cfver}"; then
+        exit 1
+    fi
 }

 OVERVIEW:
 
 Formats all C/C++ source files based on the .clang-format rules
+
+Requires clang-format version 17.0.3

 for exc in "${excludeDirs[@]}"
 do
+    # Validate directory name
+    if [[ "$exc" =~ [^a-zA-Z0-9_./-] ]]; then
+        echo "Invalid directory name: $exc"
+        exit 1
+    fi
     findargs="${findargs} ! \( -path '${exc}' -prune \)"
 done

 get_file_list()
 {
     if [[ -z "${userFiles[*]}" ]]; then
         mapfile -t file_list < <(eval "$findargs")
         if [[ ${#file_list[@]} -eq 0 ]]; then
             echo "No files were found to format!"
             exit 1
         fi
+        # Validate files
+        for file in "${file_list[@]}"; do
+            if [[ ! -r "$file" ]]; then
+                echo "Cannot read file: $file"
+                exit 1
+            fi
+        done
     else

-    $findargs+=" -Include @( "
-    foreach ($ext in $includeExts)
-    {
-        $findargs+=("'*."+"$ext'")
-        if ($includeExts.IndexOf($ext) -lt $includeExts.count-1)
-        {
-            $findargs+=", "
-        }
-    }
-    $findargs+=") "
+    $findargs += " -Include @('" + ($includeExts | ForEach-Object { "*.$_" } | Join-String -Separator "', '") + "') "

     "--exclude-dirs=*" {
-        $userExcludeDirs=($opt -split "=")[1];
+        $dirs = ($opt -split "=")[1]
+        if ($dirs -match '^[a-zA-Z0-9_/.-]+(\s+[a-zA-Z0-9_/.-]+)*$') {
+            $userExcludeDirs = $dirs
+        } else {
+            Write-Error "Invalid directory names in --exclude-dirs"
+            exit 1
+        }
         break;
     }

     "--include-exts=*" {
-        $userIncludeExts=($opt -split "=")[1];
+        $exts = ($opt -split "=")[1]
+        if ($exts -match '^[a-zA-Z0-9]+(\s+[a-zA-Z0-9]+)*$') {
+            $userIncludeExts = $exts
+        } else {
+            Write-Error "Invalid file extensions in --include-exts"
+            exit 1
+        }
         break;
     }

     foreach ( $file_name in $userfiles ) {
-        $user_file_name = get-ChildItem -Path '.' -Name $file_name
-        $file = New-Object System.IO.FileInfo($user_file_name)
+        try {
+            # Resolve full path and ensure it's under current directory
+            $full_path = Resolve-Path -Path $file_name -ErrorAction Stop
+            if (-not $full_path.Path.StartsWith((Get-Location).Path)) {
+                Write-Error "File path '$file_name' is outside current directory"
+                continue
+            }
+            $file = Get-Item -Path $full_path -ErrorAction Stop
+        } catch {
+            Write-Error "Invalid or inaccessible file: $file_name"
+            continue
+        }