jyavenard

Untitled

Jul 20th, 2012
240
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.19 KB | None | 0 0
  1. jyaimac:mythtv jyavenard$ cat tt
  2. diff --git a/mythtv/libs/libmythbase/mythcommandlineparser.cpp b/mythtv/libs/libmythbase/mythcommandlineparser.cpp
  3. index 3bbac88..6f4ee4f 100644
  4. --- a/mythtv/libs/libmythbase/mythcommandlineparser.cpp
  5. +++ b/mythtv/libs/libmythbase/mythcommandlineparser.cpp
  6. @@ -2676,7 +2676,7 @@ int MythCommandLineParser::Daemonize(void)
  7. if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
  8. LOG(VB_GENERAL, LOG_WARNING, "Unable to ignore SIGPIPE");
  9.  
  10. - if (toBool("daemon") && (daemon(0, 1) < 0))
  11. + if (toBool("daemon") && (daemon(1, 1) < 0))
  12. {
  13. cerr << "Failed to daemonize: " << ENO_STR << endl;
  14. return GENERIC_EXIT_DAEMONIZING_ERROR;
  15. diff --git a/mythtv/libs/libmythbase/mythcorecontext.cpp b/mythtv/libs/libmythbase/mythcorecontext.cpp
  16. index f267853..909bd01 100644
  17. --- a/mythtv/libs/libmythbase/mythcorecontext.cpp
  18. +++ b/mythtv/libs/libmythbase/mythcorecontext.cpp
  19. @@ -14,6 +14,7 @@
  20.  
  21. #include <cmath>
  22. #include <cstdarg>
  23. +#include <iostream>
  24.  
  25. #include <queue>
  26. #include <algorithm>
  27. @@ -191,6 +192,7 @@ bool MythCoreContext::Init(void)
  28. return false;
  29. }
  30.  
  31. + cerr << "blah5." << endl;
  32. if (d->m_appBinaryVersion != MYTH_BINARY_VERSION)
  33. {
  34. LOG(VB_GENERAL, LOG_CRIT,
  35. @@ -206,6 +208,7 @@ bool MythCoreContext::Init(void)
  36.  
  37. return false;
  38. }
  39. + cerr << "blah6." << endl;
  40.  
  41. #ifndef _WIN32
  42. QString lang_variables("");
  43. @@ -227,8 +230,10 @@ bool MythCoreContext::Init(void)
  44. lang_variables.append(", and ");
  45. lang_variables.append("LANG");
  46. }
  47. + cerr << "blah7." << endl;
  48. LOG(VB_GENERAL, LOG_INFO, QString("Assumed character encoding: %1")
  49. .arg(lc_value));
  50. + cerr << "blah8." << endl;
  51. if (!lang_variables.isEmpty())
  52. LOG(VB_GENERAL, LOG_WARNING, QString("This application expects to "
  53. "be running a locale that specifies a UTF-8 codeset, and many "
  54. @@ -237,6 +242,7 @@ bool MythCoreContext::Init(void)
  55. "in which this program is executed to include a UTF-8 codeset "
  56. "(such as 'en_US.UTF-8').").arg(lang_variables));
  57. #endif
  58. + cerr << "blah9." << endl;
  59.  
  60. return true;
  61. }
  62. diff --git a/mythtv/programs/mythlogserver/main.cpp b/mythtv/programs/mythlogserver/main.cpp
  63. index c017bf3..2ec0f41 100644
  64. --- a/mythtv/programs/mythlogserver/main.cpp
  65. +++ b/mythtv/programs/mythlogserver/main.cpp
  66. @@ -102,6 +102,8 @@ int main(int argc, char *argv[])
  67. if (!logging)
  68. return GENERIC_EXIT_OK;
  69.  
  70. + cerr << "blah." << endl;
  71. +
  72. #ifndef _WIN32
  73. QList<int> signallist;
  74. signallist << SIGINT << SIGTERM << SIGSEGV << SIGABRT << SIGBUS << SIGFPE
  75. @@ -110,13 +112,20 @@ int main(int argc, char *argv[])
  76. handler.AddHandler(SIGHUP, logSigHup);
  77. #endif
  78.  
  79. + cerr << "blah2." << endl;
  80. +
  81. gContext = new MythContext(MYTH_BINARY_VERSION);
  82. +
  83. + cerr << "blah3." << endl;
  84. +
  85. if (!gContext->Init(false))
  86. {
  87. cerr << "Failed to init MythContext, exiting." << endl;
  88. return GENERIC_EXIT_NO_MYTHCONTEXT;
  89. }
  90.  
  91. + cerr << "blah4." << endl;
  92. +
  93. qApp->exec();
  94.  
  95. return GENERIC_EXIT_OK;
  96. jyaimac:mythtv jyavenard$
Advertisement
Add Comment
Please, Sign In to add comment