patch-sc_c 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859
  1. $OpenBSD: patch-sc_c,v 1.3 2017/05/12 20:27:25 naddy Exp $
  2. Index: sc.c
  3. --- sc.c.orig
  4. +++ sc.c
  5. @@ -212,7 +212,7 @@ flush_saved()
  6. if (dbidx < 0)
  7. return;
  8. - if (p = delbuf[dbidx]) {
  9. + if ((p = delbuf[dbidx])) {
  10. scxfree(delbuffmt[dbidx]);
  11. delbuffmt[dbidx] = NULL;
  12. }
  13. @@ -274,7 +274,7 @@ main (int argc, char **argv)
  14. else
  15. progname = argv[0];
  16. - while ((c = getopt(argc, argv, "axmoncrCReP:W:vq")) != EOF) {
  17. + while ((c = getopt(argc, argv, "axmoncrCReP:W:vq")) != -1) {
  18. switch (c) {
  19. case 'a':
  20. skipautorun = 1;
  21. @@ -425,7 +425,7 @@ main (int argc, char **argv)
  22. #endif
  23. optind = 1;
  24. stopdisp();
  25. - while ((o = getopt(argc, argv, "axmoncrCReP:W:vq")) != EOF) {
  26. + while ((o = getopt(argc, argv, "axmoncrCReP:W:vq")) != -1) {
  27. switch (o) {
  28. case 'v':
  29. Vopt = 1;
  30. @@ -520,7 +520,7 @@ main (int argc, char **argv)
  31. break;
  32. }
  33. }
  34. - if (redraw) printf(redraw);
  35. + if (redraw) printf("%s", redraw);
  36. exit (0);
  37. }
  38. @@ -845,7 +845,7 @@ main (int argc, char **argv)
  39. break;
  40. case 'C':
  41. color = !color;
  42. - if (has_colors())
  43. + if (has_colors()) {
  44. if (color) {
  45. attron(COLOR_PAIR(1));
  46. bkgd(COLOR_PAIR(1) | ' ');
  47. @@ -853,6 +853,7 @@ main (int argc, char **argv)
  48. attron(COLOR_PAIR(0));
  49. bkgd(COLOR_PAIR(0) | ' ');
  50. }
  51. + }
  52. error("Color %sabled.", color ? "en" : "dis");
  53. break;
  54. case 'N':