More documentation for pax_global_header

Author: Bodigrim

Codec/Archive/Tar/Check/Internal.hs

@@ -146,8 +146,11 @@ showFileNameError mb_plat err = case err of
 checkTarbomb :: FilePath -> CheckSecurityCallback
 checkTarbomb expectedTopDir entry = do
   case entryContent entry of
-    OtherEntryType 'g' _ _ -> pure () --PAX global header
-    OtherEntryType 'x' _ _ -> pure () --PAX individual header
+    -- Global extended header aka XGLTYPE aka pax_global_header
+    -- https://pubs.opengroup.org/onlinepubs/9699919799/utilities/pax.html#tag_20_92_13_02
+    OtherEntryType 'g' _ _ -> pure ()
+    -- Extended header referring to the next file in the archive aka XHDTYPE
+    OtherEntryType 'x' _ _ -> pure ()
     _                      ->
       case FilePath.Posix.splitDirectories (entryTarPath entry) of
         (topDir:_) | topDir == expectedTopDir -> pure ()

htar/htar.hs

@@ -16,9 +16,8 @@ import System.Console.GetOpt (OptDescr(..), ArgDescr(..), ArgOrder(..),
 import System.Environment    (getArgs)
 import System.Exit           (exitFailure)
 import System.IO             (hPutStrLn, stderr)
-import Data.Time             (formatTime)
+import Data.Time             (formatTime, defaultTimeLocale)
 import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
-import Data.Time             (defaultTimeLocale)
 
 main :: IO ()
 main = do
@@ -206,12 +205,12 @@ parseOptions :: [String] -> IO (Options, [FilePath])
 parseOptions args =
   let (fs, files, nonopts, errors) = getOpt' Permute optDescr args
   in case (nonopts, errors) of
-       ([], [])    -> return $ (foldl (flip ($)) defaultOptions fs, files)
-       (_ , (_:_)) -> die errors
-       (_ ,  _)    -> die (map (("unrecognized option "++).show) nonopts)
+       ([], [])    -> return (foldl (flip ($)) defaultOptions fs, files)
+       (_ , _ : _) -> die errors
+       (_ , _)     -> die (map (("unrecognized option "++).show) nonopts)
 
 die :: [String] -> IO a
 die errs = do
-  mapM_ (\e -> hPutStrLn stderr $ "htar: " ++ e) $ errs
+  mapM_ (\e -> hPutStrLn stderr $ "htar: " ++ e) errs
   hPutStrLn stderr "Try `htar --help' for more information."
   exitFailure