Merge branch 'master' into death_of_fishd

builtin.cpp

@@ -428,7 +428,7 @@ static void builtin_bind_list(const wchar_t *bind_mode)
         if (input_terminfo_get_name(seq, tname))
         {
             append_format(stdout_buffer, L"bind -k %ls -M %ls -m %ls", tname.c_str(), mode.c_str(), sets_mode.c_str());
-            for (int i = 0; i < ecmds.size(); i++)
+            for (size_t i = 0; i < ecmds.size(); i++)
             {
                 wcstring ecmd = ecmds.at(i);
                 append_format(stdout_buffer, L" %ls", escape(ecmd.c_str(), 1));
@@ -439,7 +439,7 @@ static void builtin_bind_list(const wchar_t *bind_mode)
         {
             const wcstring eseq = escape_string(seq, 1);
             append_format(stdout_buffer, L"bind -k %ls -M %ls -m %ls", eseq.c_str(), mode.c_str(), sets_mode.c_str());
-            for (int i = 0; i < ecmds.size(); i++)
+            for (size_t i = 0; i < ecmds.size(); i++)
             {
                 wcstring ecmd = ecmds.at(i);
                 append_format(stdout_buffer, L" %ls", escape(ecmd.c_str(), 1));
@@ -3622,8 +3622,6 @@ static int builtin_history(parser_t &parser, wchar_t **argv)
     return STATUS_BUILTIN_ERROR;
 }
 
-#pragma mark Simulator
-
 int builtin_parse(parser_t &parser, wchar_t **argv)
 {
     struct sigaction act;

common.cpp

@@ -716,6 +716,18 @@ void print_stderr(const wcstring &str)
     fprintf(stderr, "%ls\n", str.c_str());
 }
 
+void read_ignore(int fd, void *buff, size_t count)
+{
+    size_t ignore __attribute__((unused));
+    ignore = read(fd, buff, count);
+}
+
+void write_ignore(int fd, const void *buff, size_t count)
+{
+    size_t ignore __attribute__((unused));
+    ignore = write(fd, buff, count);
+}
+
 
 void debug_safe(int level, const char *msg, const char *param1, const char *param2, const char *param3, const char *param4, const char *param5, const char *param6, const char *param7, const char *param8, const char *param9, const char *param10, const char *param11, const char *param12)
 {
@@ -736,7 +748,7 @@ void debug_safe(int level, const char *msg, const char *param1, const char *para
         if (end == NULL)
             end = cursor + strlen(cursor);
 
-        write(STDERR_FILENO, cursor, end - cursor);
+        write_ignore(STDERR_FILENO, cursor, end - cursor);
 
         if (end[0] == '%' && end[1] == 's')
         {
@@ -745,7 +757,7 @@ void debug_safe(int level, const char *msg, const char *param1, const char *para
             const char *format = params[param_idx++];
             if (! format)
                 format = "(null)";
-            write(STDERR_FILENO, format, strlen(format));
+            write_ignore(STDERR_FILENO, format, strlen(format));
             cursor = end + 2;
         }
         else if (end[0] == '\0')
@@ -761,7 +773,7 @@ void debug_safe(int level, const char *msg, const char *param1, const char *para
     }
 
     // We always append a newline
-    write(STDERR_FILENO, "\n", 1);
+    write_ignore(STDERR_FILENO, "\n", 1);
 
     errno = errno_old;
 }

common.h

@@ -157,6 +157,10 @@ extern bool g_profiling_active;
 */
 extern const wchar_t *program_name;
 
+/* Variants of read() and write() that ignores return values, defeating a warning */
+void read_ignore(int fd, void *buff, size_t count);
+void write_ignore(int fd, const void *buff, size_t count);
+
 /**
    This macro is used to check that an input argument is not null. It
    is a bit lika a non-fatal form of assert. Instead of exit-ing on
@@ -182,7 +186,7 @@ extern const wchar_t *program_name;
 	{															\
         char exit_read_buff;                                    \
         show_stackframe();										\
-		read( 0, &exit_read_buff, 1 );			\
+        read_ignore( 0, &exit_read_buff, 1 );                   \
         exit_without_destructors( 1 );                          \
 	}															\
  

configure.ac

@@ -200,9 +200,10 @@ CXXFLAGS="$CXXFLAGS -fno-exceptions"
 
 #
 # -Wall is there to keep me on my toes
+# But signed comparison warnings are way too aggressive
 #
 
-CXXFLAGS="$CXXFLAGS -Wall"
+CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare"
 
 #
 # This is needed in order to get the really cool backtraces on Linux

env_universal_common.cpp

@@ -335,7 +335,7 @@ static wcstring full_escape(const wchar_t *in)
         {
             out.push_back(c);
         }
-        else if (c <= ASCII_MAX)
+        else if (c <= (wchar_t)ASCII_MAX)
         {
             // See #1225 for discussion of use of ASCII_MAX here
             append_format(out, L"\\x%.2x", c);

fallback.cpp

@@ -802,6 +802,7 @@ wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **save_ptr)
 
 /* Fallback implementations of wcsdup and wcscasecmp. On systems where these are not needed (e.g. building on Linux) these should end up just being stripped, as they are static functions that are not referenced in this file.
 */
+__attribute__((unused))
 static wchar_t *wcsdup_fallback(const wchar_t *in)
 {
     size_t len=wcslen(in);

fish_tests.cpp

@@ -1331,7 +1331,7 @@ static void test_expand()
         err(L"Expansion not correctly handling literal path components in dotfiles");
     }
 
-    system("rm -Rf /tmp/fish_expand_test");
+    if (system("rm -Rf /tmp/fish_expand_test")) err(L"rm failed");
 }
 
 static void test_fuzzy_match(void)
@@ -2013,8 +2013,8 @@ static void test_autosuggest_suggest_special()
     // A single quote should defeat tilde expansion
     perform_one_autosuggestion_test(L"cd '~/test_autosuggest_suggest_specia'", wd, L"", __LINE__);
 
-    system("rm -Rf '/tmp/autosuggest_test/'");
-    system("rm -Rf ~/test_autosuggest_suggest_special/");
+    if (system("rm -Rf '/tmp/autosuggest_test/'")) err(L"rm failed");
+    if (system("rm -Rf ~/test_autosuggest_suggest_special/")) err(L"rm failed");
 }
 
 static void test_autosuggestion_combining()
@@ -3175,7 +3175,7 @@ static void test_highlighting(void)
 
         // Generate the text
         wcstring text;
-        std::vector<int> expected_colors;
+        std::vector<highlight_spec_t> expected_colors;
         for (size_t i=0; i < component_count; i++)
         {
             if (i > 0)

input.cpp

@@ -156,7 +156,7 @@ static const wchar_t * const name_arr[] =
 
 wcstring describe_char(wint_t c)
 {
-    wchar_t initial_cmd_char = R_BEGINNING_OF_LINE;
+    wint_t initial_cmd_char = R_BEGINNING_OF_LINE;
     size_t name_count = sizeof name_arr / sizeof *name_arr;
     if (c >= initial_cmd_char && c < initial_cmd_char + name_count)
     {

iothread.cpp

@@ -114,6 +114,11 @@ static void enqueue_thread_result(SpawnRequest_t *req)
     s_result_queue.push(req);
 }
 
+static void *this_thread()
+{
+    return (void *)(intptr_t)pthread_self();
+}
+
 /* The function that does thread work. */
 static void *iothread_worker(void *unused)
 {
@@ -121,7 +126,7 @@ static void *iothread_worker(void *unused)
     struct SpawnRequest_t *req;
     while ((req = dequeue_spawn_request()) != NULL)
     {
-        IOTHREAD_LOG fprintf(stderr, "pthread %p dequeued %p\n", pthread_self(), req);
+        IOTHREAD_LOG fprintf(stderr, "pthread %p dequeued %p\n", this_thread(), req);
         /* Unlock the queue while we execute the request */
         locker.unlock();
         
@@ -150,7 +155,7 @@ static void *iothread_worker(void *unused)
     assert(s_active_thread_count > 0);
     s_active_thread_count -= 1;
     
-    IOTHREAD_LOG fprintf(stderr, "pthread %p exiting\n", pthread_self());
+    IOTHREAD_LOG fprintf(stderr, "pthread %p exiting\n", this_thread());
 
     /* We're done */
     return NULL;
@@ -165,13 +170,13 @@ static void iothread_spawn()
     VOMIT_ON_FAILURE(pthread_sigmask(SIG_BLOCK, &new_set, &saved_set));
 
     /* Spawn a thread. If this fails, it means there's already a bunch of threads; it is very unlikely that they are all on the verge of exiting, so one is likely to be ready to handle extant requests. So we can ignore failure with some confidence. */
-    pthread_t thread = NULL;
+    pthread_t thread = 0;
     pthread_create(&thread, NULL, iothread_worker, NULL);
     
     /* We will never join this thread */
     VOMIT_ON_FAILURE(pthread_detach(thread));
     
-    IOTHREAD_LOG fprintf(stderr, "pthread %p spawned\n", thread);
+    IOTHREAD_LOG fprintf(stderr, "pthread %p spawned\n", (void *)(intptr_t)thread);
     
     /* Restore our sigmask */
     VOMIT_ON_FAILURE(pthread_sigmask(SIG_SETMASK, &saved_set, NULL));

key_reader.cpp

@@ -22,7 +22,7 @@
 
 int writestr(char *str)
 {
-    write(1, str, strlen(str));
+    write_ignore(1, str, strlen(str));
     return 0;
 }
 

parse_execution.cpp

@@ -503,7 +503,6 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(const pars
 parse_execution_result_t parse_execution_context_t::run_switch_statement(const parse_node_t &statement)
 {
     assert(statement.type == symbol_switch_statement);
-    parse_execution_result_t ret = parse_execution_success;
     const parse_node_t *matching_case_item = NULL;
 
     parse_execution_result_t result = parse_execution_success;
@@ -530,7 +529,7 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(const p
         {
             /* Store the node that failed to expand */
             report_error(switch_value_node, WILDCARD_ERR_MSG, switch_value.c_str());
-            ret = parse_execution_errored;
+            result = parse_execution_errored;
             break;
         }
 

parse_tree.cpp

@@ -525,7 +525,7 @@ class parse_ll_t
     {
         PARSE_ASSERT(! symbol_stack.empty());
         const parse_stack_element_t &top_symbol = symbol_stack.back();
-        PARSE_ASSERT(top_symbol.node_idx != -1);
+        PARSE_ASSERT(top_symbol.node_idx != NODE_OFFSET_INVALID);
         PARSE_ASSERT(top_symbol.node_idx < nodes.size());
         return nodes.at(top_symbol.node_idx);
     }

parser.cpp

@@ -866,10 +866,9 @@ int parser_t::eval(const wcstring &cmd, const io_chain_t &io, enum block_type_t
     execution_contexts.push_back(ctx);
 
     /* Execute the first node */
-    int result = 1;
     if (! tree.empty())
     {
-        result = this->eval_block_node(0, io, block_type);
+        this->eval_block_node(0, io, block_type);
     }
 
     /* Clean up the execution context stack */

proc.cpp

@@ -383,8 +383,6 @@ static void mark_process_status(const job_t *j, process_t *p, int status)
     }
     else
     {
-        ssize_t ignore;
-
         /* This should never be reached */
         p->completed = 1;
 
@@ -398,7 +396,7 @@ static void mark_process_status(const job_t *j, process_t *p, int status)
           handler. If things aren't working properly, it's safer to
           give up.
          */
-        ignore = write(2, mess, strlen(mess));
+        write_ignore(2, mess, strlen(mess));
     }
 }
 
@@ -845,15 +843,16 @@ unsigned long proc_get_jiffies(process_t *p)
                        &cnswap, &exit_signal, &processor
                       );
 
+    /*
+      Don't need to check exit status of fclose on read-only streams
+    */
+    fclose(f);
+    
     if (count < 17)
     {
         return 0;
     }
 
-    /*
-      Don't need to check exit status of fclose on read-only streams
-    */
-    fclose(f);
     return utime+stime+cutime+cstime;
 
 }

screen.cpp

@@ -48,7 +48,7 @@ efficient way for transforming that to the desired screen content.
 #include "pager.h"
 
 /** The number of characters to indent new blocks */
-#define INDENT_STEP 4
+#define INDENT_STEP 4u
 
 /** The initial screen width */
 #define SCREEN_WIDTH_UNINITIALIZED -1

wutil.cpp

@@ -366,7 +366,7 @@ void safe_perror(const char *message)
     safe_append(buff, safe_strerror(err), sizeof buff);
     safe_append(buff, "\n", sizeof buff);
 
-    write(STDERR_FILENO, buff, strlen(buff));
+    write_ignore(STDERR_FILENO, buff, strlen(buff));
     errno = err;
 }