Topic silence warnings (#364)

* xdotool.1: Fix rendering of example commands

italic does not work in verbatim paragraphs, remove it:
 sed -i -e 's/^\(  *.*\)I</\1</g' xdotool.pod

Signed-off-by: Bernhard Reutner-Fischer <[email protected]>

* Error out on allocation failure

.. when allocating space for tokens while parsing.
The array allocation was checked already, also check that allocating
memory for the content works out fine.

Signed-off-by: Bernhard Reutner-Fischer <[email protected]>

* Fix tokenizing a single-line command chain

I was getting 'Unknown command: <garbage-on-stack>' for a sequence of
commands that containted no newline:
echo -n "several commands and args here" | xdotool -

fgets null-terminates the buffer, but we were tokenizing past the end of
the read line in the while-loop since we skipped the _final_ zero byte.

There was another bug when tokenizing the commandline arguments when
one token spans more than one buffer, the token was seen as two arguments,
cut in half mid-word where the previous buffer ended and the new buffer
started. E.g.: printf "mousemove%-4083s--polar -- 0 0" " "
complained that "Unknown command: olar".
Another incarnation of the same bug could be observed if you fed a token
into script_main that was longer than the buffer size: It was split on
the buffer boundary, making several tokens out of the single token given
by the user. E.g.:
 perl -le 'print(("X"x 9000))' > input-9000
or
 python3 -c 'print("X" * 9000)' > input-9000
and looking at the script argv when cat input-9000 | xdotool -

Or printf "mousemove%4107s" "--polar -- 0 0 sleep 0.1" > /tmp/i
(cat /tmp/i;echo " sleep 4";echo mousemove --polar -- 30 30) | ./xdotool -

Fix this by correctly handling tokens that cross buffers.

Diagnose allocation failures while at it.

Signed-off-by: Bernhard Reutner-Fischer <[email protected]>

* fix memory leak in mousemove, mousedown

window_arg was strdup()ed but not freed, fix that.

Signed-off-by: Bernhard Reutner-Fischer <[email protected]>

* Remove superfluous guards around free(NULL)

SUS specifies that free(NULL) is perfectly valid (a noop).
Remove superfluous guards.

Signed-off-by: Bernhard Reutner-Fischer <[email protected]>

* window_is_valid(): make static

This is a private helper-function of window_get_arg() and not used
anywhere else.

Signed-off-by: Bernhard Reutner-Fischer <[email protected]>

* context_execute(): Move prototype to xdo_cmd.h

and remove now redundant declarations.
A single declaration avoids the risk of diverging scattered
declarations.

Signed-off-by: Bernhard Reutner-Fischer <[email protected]>

* xdotool: Remove redundant declarations

These live in xdo_cmd.h so are redundant in xdotool.c

Signed-off-by: Bernhard Reutner-Fischer <[email protected]>

* getwindowclassname: silence warning

1) warning: no previous prototype for ‘xdo_get_window_classname’
2) warning: pointer targets in assignment from ‘char *’ to ‘unsigned char *’ differ in signedness
   for classhint.res_class

Signed-off-by: Bernhard Reutner-Fischer <[email protected]>

Author: aldot

Diff for: cmd_behave.c

@@ -13,9 +13,6 @@ struct events {
   { NULL, 0 },
 };
 
-/* So we can invoke xdotool from within this command */
-extern int context_execute(context_t *context);
-
 int cmd_behave(context_t *context) {
   int ret = 0;
   char *cmd = *context->argv;

Diff for: cmd_behave_screen_edge.c

@@ -304,9 +304,7 @@ int cmd_behave_screen_edge(context_t *context) {
       } /* if quiesce */
     } /* if trigger == True */
 
-    if (tmpcontext != NULL) {
-      free(tmpcontext);
-    }
+    free(tmpcontext);
 
     if (ret != XDO_SUCCESS) {
       printf("Command failed.\n");

Diff for: cmd_exec.c

@@ -116,9 +116,7 @@ int cmd_exec(context_t *context) {
   }
 
   consume_args(context, command_count);
-  if (terminator != NULL) {
-    free(terminator);
-  }
+  free(terminator);
 
   for (i=0; i < command_count; i++) {
     free(command[i]);

Diff for: cmd_mousedown.c

@@ -73,6 +73,7 @@ int cmd_mousedown(context_t *context) {
   }); /* window_each(...) */
 
   consume_args(context, 1);
+  free(window_arg);
 
   return ret;
 }

Diff for: cmd_mousemove.c

@@ -131,6 +131,8 @@ int cmd_mousemove(context_t *context) {
     }
   }); /* window_each(...) */
 
+  free(window_arg);
+
   return ret;
 }
 

Diff for: cmd_mouseup.c

@@ -72,9 +72,7 @@ int cmd_mouseup(context_t *context) {
     }
   }); /* window_each(...) */
 
-  if (window_arg != NULL) {
-    free(window_arg);
-  }
+  free(window_arg);
   consume_args(context, 1);
   return ret;
 }

Diff for: cmd_search.c

@@ -190,9 +190,7 @@ int cmd_search(context_t *context) {
   }
 
   do {
-    if (list != NULL) {
-      free(list);
-    }
+    free(list);
 
     xdo_search_windows(context->xdo, &search, &list, &nwindows);
 
@@ -214,9 +212,7 @@ int cmd_search(context_t *context) {
   } while (op_sync && nwindows == 0);
 
   /* Free old list as it's malloc'd by xdo_search_windows */
-  if (context->windows != NULL) {
-    free(context->windows);
-  }
+  free(context->windows);
   context->windows = list;
   context->nwindows = nwindows;
 

Diff for: xdo.c

@@ -160,10 +160,8 @@ void xdo_free(xdo_t *xdo) {
   if (xdo == NULL)
     return;
 
-  if (xdo->display_name)
-    free(xdo->display_name);
-  if (xdo->charcodes)
-    free(xdo->charcodes);
+  free(xdo->display_name);
+  free(xdo->charcodes);
   if (xdo->xdpy && xdo->close_display_when_freed)
     XCloseDisplay(xdo->xdpy);
 
@@ -1038,9 +1036,7 @@ int _xdo_send_keysequence_window_do(const xdo_t *xdo, Window window, const char
   }
 
   ret = xdo_send_keysequence_window_list_do(xdo, window, keys, nkeys, pressed, modifier, delay);
-  if (keys != NULL) {
-    free(keys);
-  }
+  free(keys);
 
   return ret;
 }
@@ -1936,12 +1932,16 @@ int xdo_get_window_name(const xdo_t *xdo, Window window,
   return 0;
 }
 
-int xdo_get_window_classname(const xdo_t *xdo, Window window, unsigned char **name_ret) {
+int xdo_get_window_classname(const xdo_t *xdo, Window window, unsigned char **class_ret) {
   XClassHint classhint;
-  XGetClassHint(xdo->xdpy, window, &classhint);
-  XFree(classhint.res_name);
-  *name_ret = (unsigned char*) classhint.res_class;
-  return 0;
+  Status ret = XGetClassHint(xdo->xdpy, window, &classhint);
+
+  if (ret) {
+    XFree(classhint.res_name);
+    *class_ret = (unsigned char*) classhint.res_class;
+  } else
+    *class_ret = NULL;
+  return _is_success("XGetClassHint[WM_CLASS]", ret == 0, xdo);
 }
 
 int xdo_window_state(xdo_t *xdo, Window window, unsigned long action, const char *property) {
@@ -2058,4 +2058,4 @@ static int appears_to_be_wayland(Display *xdpy) {
   XFreeDeviceList(devices);
 
   return 0;
-}
+}

Diff for: xdo.h

@@ -618,6 +618,13 @@ int xdo_minimize_window(const xdo_t *xdo, Window wid);
 #define _NET_WM_STATE_ADD           1    /* add/set property */
 #define _NET_WM_STATE_TOGGLE        2    /* toggle property  */
 
+/**
+ * Get window classname
+ * @param window the window
+ * @param class_ret Pointer to the window classname WM_CLASS
+ */
+int xdo_get_window_classname(const xdo_t *xdo, Window window, unsigned char **class_ret);
+
 /**
  * Change window state
  * @param action the _NET_WM_STATE action

Diff for: xdo_cmd.h

@@ -32,10 +32,11 @@ extern void window_list(context_t *context, const char *window_arg,
 extern void window_save(context_t *context, Window window);
 extern int is_command(char *cmd);
 
-extern int window_is_valid(context_t *context, const char *window_arg);
 extern int window_get_arg(context_t *context, int min_arg, int window_arg_pos,
                           const char **window_arg);
 
+extern int context_execute(context_t *);
+
 extern void xdotool_debug(context_t *context, const char *format, ...);
 extern void xdotool_output(context_t *context, const char *format, ...);