Merge pull request #183 from cs50/develop

adds back get_long_long for Windows

Author: Kareem Zidane

Diff for: .travis.yml

@@ -84,6 +84,10 @@ deploy:
   - <<: *deb
     dist: ubuntu/bionic
 
+  # 19.04
+  - <<: *deb
+    dist: ubuntu/disco
+
   # Fedora
   - <<: *rpm
     dist: fedora/24

Diff for: Makefile

@@ -1,4 +1,4 @@
-VERSION := 9.0.2
+VERSION := 9.1.0
 MAJOR_VERSION := $(shell echo $(VERSION) | head -c 1)
 
 # installation directory (/usr/local by default)

Diff for: docs/eprintf.3

@@ -397,6 +397,43 @@ long get_long(const char *format, ...)
     }
 }
 
+/**
+ * Prompts user for a line of text from standard input and returns the
+ * equivalent long long; if text does not represent a long long in
+ * [-2^63, 2^63 - 1) or would cause underflow or overflow, user is
+ * prompted to retry. If line can't be read, returns LLONG_MAX.
+ */
+long long get_long_long(const string format, ...)
+{
+    va_list ap;
+    va_start(ap, format);
+
+    // Try to get a long long from user
+    while (true)
+    {
+        // Get line of text, returning LLONG_MAX on failure
+        string line = get_string(&ap, format);
+        if (line == NULL)
+        {
+            va_end(ap);
+            return LLONG_MAX;
+        }
+
+        // Return a long long if only a long long (in range) was provided
+        if (strlen(line) > 0 && !isspace((unsigned char) line[0]))
+        {
+            char *tail;
+            errno = 0;
+            long long n = strtoll(line, &tail, 10);
+            if (errno == 0 && *tail == '\0' && n < LLONG_MAX)
+            {
+                va_end(ap);
+                return n;
+            }
+        }
+    }
+}
+
 /**
  * Called automatically after execution exits main.
  */

Diff for: src/cs50.c

@@ -94,6 +94,14 @@ int get_int(const char *format, ...) __attribute__((format(printf, 1, 2)));
  */
 long get_long(const char *format, ...) __attribute__((format(printf, 1, 2)));
 
+/**
+ * Prompts user for a line of text from standard input and returns the
+ * equivalent long long; if text does not represent a long long in
+ * [-2^63, 2^63 - 1) or would cause underflow or overflow, user is
+ * prompted to retry. If line can't be read, returns LLONG_MAX.
+ */
+long long get_long_long(const string format, ...) __attribute__((format(printf, 1, 2)));
+
 /**
  * Prompts user for a line of text from standard input and returns
  * it as a string (char *), sans trailing line ending. Supports