X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fmain.c;h=9c7191d6e3e4e34daf1e13230d8cee3c48f6f01e;hp=ef443b29628e04249e50bb28abe7995b2700ef6b;hb=f1f8d9a6c9b1fd35d79627b568faa2409f13311f;hpb=163bd86071a90b77eb8b0e03927b0ed8908eb892

diff --git a/src/main.c b/src/main.c
index ef443b2962..9c7191d6e3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,49 +1,43 @@
-/***************************************************************************
- *   Copyright (C) 2005 by Dominic Rath                                    *
- *   Dominic.Rath@gmx.de                                                   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   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.             *
- ***************************************************************************/
-
-/* implementations of OpenOCD that uses multithreading needs to lock OpenOCD while calling
- * OpenOCD fn's. No-op in vanilla OpenOCD
- */
-void lockBigLock()
-{
-}
-void unlockBigLock()
-{
-}
-
-/* 
-	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[])
-{
-	return openocd_main(argc, argv);
-}
-
+/***************************************************************************
+ *   Copyright (C) 2005 by Dominic Rath                                    *
+ *   Dominic.Rath@gmx.de                                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   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.             *
+ ***************************************************************************/
+
+
+#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. */
+
+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);
+}