Changeset 1253 for branches


Ignore:
Timestamp:
Mar 31, 2009, 12:34:27 PM (9 years ago)
Author:
dkg
Message:

[svn-upgrade] Integrating new upstream version, xdotool (20090330)

Location:
branches/upstream/xdotool/current
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/upstream/xdotool/current/CHANGELIST

    r1248 r1253  
     120090330:
     2  * Fix bug where we use the wrong type in sizeof() for allocating character
     3    code map.
     4  * Fix tiny problem where we would try to free() an invalid pointer
     5
    1620090126:
    27  * Change the default behavior of 'getwindowfocus' to get the first
  • branches/upstream/xdotool/current/xdo.c

    r1248 r1253  
    11/* xdo library
    22 *
    3  * $Id: xdo.c 2158 2009-01-26 11:05:03Z jordansissel $
     3 * $Id: xdo.c 2172 2009-03-30 02:38:06Z jordansissel $
    44 *
    55 * - getwindowfocus contributed by Lee Pumphret
     
    603603  }
    604604
    605   free(keys);
     605  if (keys != NULL) {
     606    free(keys);
     607  }
    606608  XFlush(xdo->xdpy);
    607609  return ret;
     
    798800  char *tokctx = NULL;
    799801  const char *tok = NULL;
    800   char *strptr = NULL;
     802  char *keyseq_copy = NULL, *strptr = NULL;
    801803  int i;
    802804  KeyCode shift_keycode;
     
    813815  shift_keycode = XKeysymToKeycode(xdo->xdpy, XStringToKeysym("Shift_L"));
    814816
    815   *keys = malloc(keys_size * sizeof(KeyCode));
    816   strptr = strdup(keyseq);
     817  *keys = malloc(keys_size * sizeof(charcodemap_t));
     818  keyseq_copy = strptr = strdup(keyseq);
    817819  while ((tok = strtok_r(strptr, "+", &tokctx)) != NULL) {
    818820    KeySym sym;
     
    854856  }
    855857
    856   free(strptr);
     858  free(keyseq_copy);
    857859
    858860  return True;
  • branches/upstream/xdotool/current/xdotool.pod

    r1248 r1253  
    244244
    245245This manual page was written originally by Daniel Kahn Gillmor
    246 E<lt>dkg-debian.org@fifthhorseman.netE<gt> for the Debian project (but may be
     246E<lt>dkg@fifthhorseman.netE<gt> for the Debian project (but may be
    247247used by others). It is maintained by Jordan Sissel.
    248248
Note: See TracChangeset for help on using the changeset viewer.