Rebasing

Dockerfile

@@ -43,4 +43,5 @@ FROM base AS final
 
 WORKDIR /tmp
 
-CMD ["/usr/src/cloc", "--help"]
+ENTRYPOINT ["/usr/src/cloc"]
+CMD ["--help"]

README.md

@@ -5,13 +5,13 @@
 * * *
 cloc counts blank lines, comment lines, and physical lines of source code in many programming languages.
 
-Latest release:  v1.94 (July 4, 2022)
+Latest release:  v1.96 (Dec. 18, 2022)
 
 <a href="https://github.com/AlDanial/cloc/graphs/contributors" alt="Contributors">
     <img src="https://img.shields.io/github/contributors/AlDanial/cloc" /></a>
 <a href="https://zenodo.org/badge/latestdoi/42029482">
     <img src="https://zenodo.org/badge/42029482.svg" alt="DOI"></a>
-<img src="https://img.shields.io/badge/Maintained%3F-yes-green.svg>" />
+<img src="https://img.shields.io/github/downloads/AlDanial/cloc/total.svg">
 
 cloc moved to GitHub in September 2015 after being hosted
 at http://cloc.sourceforge.net/ since August 2006.
@@ -64,10 +64,18 @@ Step 3:  Invoke cloc to count your source files, directories, archives,
 or git commits.
 The executable name differs depending on whether you use the
 development source version (`cloc`), source for a
-released version (`cloc-1.94.pl`) or a Windows executable
-(`cloc-1.94.exe`).  On this page, `cloc` is the generic term
+released version (`cloc-1.96.pl`) or a Windows executable
+(`cloc-1.96.1.exe`).
+(2023-01-10: a special
+[1.96.1 release](https://github.com/AlDanial/cloc/releases/tag/v1.96.1) of cloc was made to update the Windows executable to use the
+``Win32::LongPath`` module.)
+On this page, `cloc` is the generic term
 used to refer to any of these.
 
+[Include Security](https://www.youtube.com/user/IncludeSecurity) has a
+[YouTube video](https://www.youtube.com/watch?v=eRLTkDMsCqs)
+showing the steps in action.
+
 **a file**
 <pre>
 prompt> cloc hello.c
@@ -424,6 +432,12 @@ executable and also check sites such
 https://www.virustotal.com/ .
 The entries for recent versions are:
 
+cloc-1.96.1.exe:
+https://www.virustotal.com/gui/file/00b1c9dbbfb920dabd374418e1b86d2c24b8cd2b8705aeb956dee910d0d75d45?nocache=1
+
+cloc-1.96.exe:
+https://www.virustotal.com/gui/file/54bf5f46fbaba7949c4eb2d4837b03c774c0ba587448a5bad9b8efc0222b1583?nocache=1
+
 cloc-1.94.exe:
 https://www.virustotal.com/gui/file/b48a6002fb75fa66ec5d0c05a5c4d51f2ad22b5b025b7eb4e3945d18419c0952?nocache=1
 
@@ -503,7 +517,8 @@ C:> cpan -i Digest::MD5
 C:> cpan -i Regexp::Common
 C:> cpan -i Algorithm::Diff
 C:> cpan -i PAR::Packer
-C:> pp -M Digest::MD5 -c -x -o cloc-1.94.exe cloc-1.94.pl
+C:> cpan -i Win32::LongPath
+C:> pp -M Win32::LongPath -M Encode::Unicode -M Digest::MD5 -c -x -o cloc-1.96.exe cloc-1.96.pl
 </pre>
 
 A variation on the instructions above is if you installed the portable
@@ -1055,9 +1070,12 @@ C#                         (cs)
 C# Designer                (designer.cs)
 C++                        (C, c++, cc, CPP, cpp, cxx, h++, inl, ipp, pcc, tcc, tpp)
 C/C++ Header               (H, h, hh, hpp, hxx)
+Cairo                      (cairo)
 Cake Build Script          (cake)
+Carbon                     (carbon)
 CCS                        (ccs)
 Chapel                     (chpl)
+Circom                     (circom)
 Clean                      (dcl, icl)
 Clojure                    (boot, cl2, clj, cljs.hl, cljscm, cljx, hic, riemann.config)
 ClojureC                   (cljc)
@@ -1067,6 +1085,7 @@ COBOL                      (CBL, cbl, ccp, COB, cob, cobol, cpy)
 CoffeeScript               (_coffee, cakefile, cjsx, coffee, iced)
 ColdFusion                 (cfm, cfml)
 ColdFusion CFScript        (cfc)
+Containerfile              (Containerfile)
 Coq                        (v)
 Crystal                    (cr)
 CSON                       (cson)
@@ -1134,6 +1153,7 @@ Haskell                    (hs, hsc, lhs)
 Haxe                       (hx, hxsl)
 HCL                        (hcl, nomad, tf, tfvars)
 HLSL                       (cg, cginc, fxh, hlsl, hlsli, shader)
+HolyC                      (HC)
 Hoon                       (hoon)
 HTML                       (htm, html, html.hl, xht)
 HTML EEx                   (heex)
@@ -1156,15 +1176,16 @@ JSX                        (jsx)
 Julia                      (jl)
 Juniper Junos              (junos)
 Jupyter Notebook           (ipynb)
-kvlang                     (kv)
 Kermit                     (ksc)
 Korn Shell                 (ksh)
 Kotlin                     (kt, ktm, kts)
+kvlang                     (kv)
 Lean                       (hlean, lean)
 Lem                        (lem)
 LESS                       (less)
 lex                        (l, lex)
 LFE                        (lfe)
+Linker Script              (ld)
 liquid                     (liquid)
 Lisp                       (asd, el, lisp, lsp, cl, jl)
 Literate Idris             (lidr)
@@ -1193,28 +1214,33 @@ NASTRAN DMAP               (dmap)
 Nemerle                    (n)
 Nim                        (nim, nim.cfg, nimble, nimrod, nims)
 Nix                        (nix)
+Nunjucks                   (njk)
 Objective-C                (m)
 Objective-C++              (mm)
 OCaml                      (eliom, eliomi, ml, ml4, mli, mll, mly)
 Odin                       (odin)
 OpenCL                     (cl)
+OpenSCAD                   (scad)
 Oracle Forms               (fmt)
 Oracle PL/SQL              (bod, fnc, prc, spc, trg)
 Oracle Reports             (rex)
+P4                         (p4)
 Pascal                     (dpr, lpr, p, pas, pascal)
 Pascal/Puppet              (pp)
 Patran Command Language    (pcl, ses)
 PEG                        (peg)
 peg.js                     (pegjs)
 peggy                      (peggy)
 Perl                       (ack, al, cpanfile, makefile.pl, perl, ph, plh, plx, pm, psgi, rexfile, pl, p6)
+Pest                       (pest)
 PHP                        (aw, ctp, phakefile, php, php3, php4, php5, php_cs, php_cs.dist, phps, phpt, phtml)
 PHP/Pascal                 (inc)
 Pig Latin                  (pig)
 PL/I                       (pl1)
 PL/M                       (lit, plm)
 PlantUML                   (puml)
 PO File                    (po)
+Pony                       (pony)
 PowerBuilder               (pbt, sra, srf, srm, srs, sru, srw)
 PowerShell                 (ps1, psd1, psm1)
 ProGuard                   (pro)
@@ -1277,6 +1303,7 @@ Swift                      (swift)
 SWIG                       (i)
 TableGen                   (td)
 Tcl/Tk                     (itk, tcl, tk)
+TEAL                       (teal)
 Teamcenter met             (met)
 Teamcenter mth             (mth)
 TeX                        (aux, bbx, bib, bst, cbx, dtx, ins, lbx, ltx, mkii, mkiv, mkvi, sty, tex, cls)
@@ -1310,6 +1337,7 @@ Visualforce Page           (page)
 Vuejs Component            (vue)
 Web Services Description   (wsdl)
 WebAssembly                (wast, wat)
+WGSL                       (wgsl)
 Windows Message File       (mc)
 Windows Module Definition  (def)
 Windows Resource File      (rc, rc2)
@@ -3062,7 +3090,7 @@ provided the
 [Serbo-Croatian](http://science.webhostinggeeks.com/cloc)
 translation.
 
-Gill Ajoft of [Ajoft Softwares](http://www.ajoft.com)
+Gill Ajoft of [Ajoft Software](http://www.ajoft.com)
 provided the
 [Bulgarian](http://www.ajoft.com/wpaper/aj-cloc.html)
 translation.

Unix/NEWS

@@ -1,3 +1,36 @@
+                Release Notes for cloc version 1.96
+                   https://github.com/AlDanial/cloc
+                             Dec. 18, 2022
+
+New Languages and File Types:
+    o Cairo
+    o Carbon
+    o Circom
+    o Containerfile
+    o HolyC
+    o kvlang
+    o Nunjucks
+    o OpenSCAD
+    o P4
+    o Pest
+    o Pony
+    o TEAL
+    o WGSL
+
+Updates:
+    o New switch --diff-list-files to run diff given two list
+      files.
+    o Handle comments embedded in OCaml strings.
+    o Write empty JSON and XML structures if the inputs yield zero
+      counts.
+    o Including Win32::LongPath to support long paths on Windows.
+    o Better support for building and running Docker image on Windows
+    o Better output file names when running with --count-and-diff 
+      and --out.
+    o Resolve internal file handle conflict when running --diff with
+      --sdir or --categorized.
+
+============================================================================
                 Release Notes for cloc version 1.94
                    https://github.com/AlDanial/cloc
                              July 4, 2022
@@ -263,7 +296,7 @@ Updates:
       logic.
     o Improve Perl v. Prolog identification.
     o New switch --docstring-as-code to count Python docstrings as code.
-    o Partial support fot Lua nested comments.
+    o Partial support for Lua nested comments.
     o Renamed Skylark to Starlark.
     o Modified Java filter to try to handle embedded comments better.
     o Recognize groovy as one of the #! languages.
@@ -283,7 +316,7 @@ Updates:
                    https://github.com/AlDanial/cloc
                            Oct. 5, 2018
 
-This is a bug-fix release to solve mis-handling of git inputs for
+This is a bug-fix release to solve miss-handling of git inputs for
 straight counts in 1.78 (--git --diff works ok in 1.78),
 https://github.com/AlDanial/cloc/issues/328.
 
@@ -438,10 +471,10 @@ Updates:
       on older versions of Perl on Windows).
     o Put timeout around Regexp::Common regex evaluation to prevent
       hangs on unbalanced comment markers within huge strings (issue 206).
-    o Fix Pascal regex wiht '{' for Perl version >= 5.26 (issue 209)
+    o Fix Pascal regex with '{' for Perl version >= 5.26 (issue 209)
       and '(*', '*)' comment matching (issue 212).
     o Rename Antlr to ANTLR Grammar.
-    o Add .g4 extension fo ANTLR Grammar.
+    o Add .g4 extension for ANTLR Grammar.
     o Replace soon-to-be deprecated File::Glob::glob() with
       File::Glob::bsd_glob() (issue 214).
     o Revert from charset=iso-8859-1 to charset=utf-8 on undocumented
@@ -1180,7 +1213,7 @@ Bug Fixes:
   IDL:     Include .pro as a recognized file extension.
 
   --3:   
-      o Correct XSLT syle when running with --3.
+      o Correct XSLT style when running with --3.
 
   --diff:   
       o Implemented YAML output option.