patch-process_c 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  2. --- screen-4.0.3.orig/process.c 2003-09-18 14:53:54.000000000 +0200
  3. +++ screen-4.0.3/process.c 2008-12-08 04:59:51.000000000 +0100
  4. @@ -728,7 +728,7 @@ int ilen;
  5. if (D_seqp[l] != l)
  6. {
  7. q = D_seqp + 1 + l;
  8. - if (D_kmaps + D_nseqs > q && q[2] > l && !bcmp(D_seqp - l, q + 3, l))
  9. + if (D_kmaps + D_nseqs > q && q[2] > l && !memcmp(D_seqp - l, q + 3, l))
  10. {
  11. debug1("have another mapping (%s), delay execution\n", q + 3);
  12. D_seqh = D_seqp - 3 - l;
  13. @@ -2867,7 +2867,7 @@ int key;
  14. s = 0;
  15. if (ParseSaveStr(act, &s))
  16. break;
  17. - if (!*s || strlen(s) + (SockName - SockPath) > MAXPATHLEN - 13 || index(s, '/'))
  18. + if (!*s || strlen(s) + (SockName - SockPath) > MAXPATHLEN - 13 || strchr(s, '/'))
  19. {
  20. Msg(0, "%s: bad session name '%s'\n", rc_name, s);
  21. free(s);
  22. @@ -3109,7 +3109,7 @@ int key;
  23. break;
  24. }
  25. else
  26. - if (*argl == (kme->fl & ~KMAP_NOTIMEOUT) && bcmp(kme->str, *args, *argl) == 0)
  27. + if (*argl == (kme->fl & ~KMAP_NOTIMEOUT) && memcmp(kme->str, *args, *argl) == 0)
  28. break;
  29. if (i == kmap_extn)
  30. {
  31. @@ -4387,7 +4387,7 @@ int base, psize;
  32. char *s, *p;
  33. {
  34. char *q;
  35. - if ((q = rindex(s, ':')) != 0)
  36. + if ((q = strrchr(s, ':')) != 0)
  37. {
  38. strncpy(p, q + 1, psize - 1);
  39. p[psize - 1] = '\0';