update files to correct FSF address

[openocd] / src / main.c

diff --git a/src/main.c b/src/main.c
index ce6e919f9a84f7e83ada0c7aa7a8176ef408c1f8..f3ff51b66b2a133c42b49273184faaf1068c3bad 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -15,38 +15,28 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
-/* implementations of OpenOCD that uses multithreading needs to know when
- * OpenOCD is sleeping. No-op in vanilla OpenOCD
- */
-void openocd_sleep_prelude()
-{
-}
-
-void openocd_sleep_postlude()
-{
-}
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "openocd.h"
 
+/* This is the main entry for developer PC hosted OpenOCD.
+ *
+ * OpenOCD can also be used as a library that is linked with
+ * another application(not mainstream yet, but possible), e.g.
+ * w/as an embedded application.
+ *
+ * Those applications will have their own main() implementation
+ * and use bits and pieces from openocd.c. */
 
-/* 
-       This is the main entry for developer PC hosted OpenOCD.
-       
-       OpenOCD can also be used as a library that is linked with
-       another application(not mainstream yet, but possible), e.g.
-       w/as an embedded application.
-       
-       Those applications will have their own main() implementation
-       and use bits and pieces from openocd.c.
-       
-*/
-
-
-extern int openocd_main(int argc, char *argv[]);
 int main(int argc, char *argv[])
 {
+       /* disable buffering otherwise piping to logs causes problems work */
+       setvbuf(stdout, NULL, _IONBF, 0);
+       setvbuf(stderr, NULL, _IONBF, 0);
+
        return openocd_main(argc, argv);
 }
-
-