Handle ioctl failure.

Make ProgramArgs enum a class enum.
PDAL · Feb 12, 2016 · c0e4eae · c0e4eae
1 parent 83db43e
commit c0e4eae
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/include/pdal/util/ProgramArgs.hpp b/include/pdal/util/ProgramArgs.hpp
@@ -40,33 +40,26 @@ class arg_error
 };
 
 
-namespace
-{
-namespace PosType
-{
+/**
+   Description of an argument that can be parsed by \class ProgramArgs.
 
+   Stores information about each argument including the required "longname",
+   an optional single-character shortname, a description, and an indicator
+   of the positional-type of the argument.
+*/
+class Arg
+{
+public:
 /**
   Positional type.  Either None, Optional or Required.
 */
-enum Enum
+enum class PosType
 {
     None,       ///< Not positional
     Required,   ///< Required positional
     Optional    ///< Optional positional
 };
 
-} // namespace PosType
-} // unnamed namespace
-
-/**
-   Description of an argument that can be parsed by \class ProgramArgs.
-
-   Stores information about each argument including the required "longname",
-   an optional single-character shortname, a description, and an indicator
-   of the positional-type of the argument.
-*/
-class Arg
-{
 protected:
     /**
       Constructor.
@@ -175,7 +168,7 @@ class Arg
       Returns the positional type of the argument.
       \note  Not intended to be called from user code.
     */
-    PosType::Enum positional() const
+    PosType positional() const
         { return m_positional; }
 
     /**
@@ -227,7 +220,7 @@ class Arg
     std::string m_rawVal;
     bool m_set;
     bool m_hidden;
-    PosType::Enum m_positional;
+    PosType m_positional;
 };
 
 /**
@@ -538,7 +531,7 @@ class VArg : public Arg
             {
                 break;
             }
-        if (cnt == 0 && m_positional == PosType::Required)
+        if (cnt == 0 && m_positional == Arg::PosType::Required)
         {
             std::ostringstream oss;
 
@@ -1065,9 +1058,9 @@ class ProgramArgs
         for (auto ai = m_args.begin(); ai != m_args.end(); ++ai)
         {
             Arg *arg = ai->get();
-            if (arg->positional() == PosType::Optional)
+            if (arg->positional() == Arg::PosType::Optional)
                 opt = true;
-            if (opt && (arg->positional() == PosType::Required))
+            if (opt && (arg->positional() == Arg::PosType::Required))
                 throw arg_error("Found required positional argument after "
                     "optional positional argument.");
         }

diff --git a/src/util/Utils.cpp b/src/util/Utils.cpp
@@ -527,7 +527,8 @@ int Utils::screenWidth()
     return 80;
 #else
     struct winsize ws;
-    ioctl(0, TIOCGWINSZ, &ws);
+    if (ioctl(0, TIOCGWINSZ, &ws))
+        return 80;
 
     return ws.ws_col;
 #endif