Remove zmfix

justinlawrence · Dec 22, 2013 · e9bb632 · e9bb632
1 parent 0556187
commit e9bb632
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 223 deletions.
diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
@@ -166,7 +166,6 @@ if ( $command =~ /^(?:start|restart)$/ )
             }
         }
 		zmMemTidy();
-		runCommand( "zmfix" );
 		runCommand( "zmdc.pl startup" );
 
 		my $sql = "select * from Monitors";

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -16,7 +16,6 @@ add_executable(zmf zmf.cpp)
 add_executable(zms zms.cpp)
 add_executable(nph-zms zms.cpp)
 add_executable(zmstreamer zmstreamer.cpp)
-add_executable(zmfix zmfix.cpp zm_config.cpp zm_regexp.cpp zm_logger.cpp zm_utils.cpp zm_db.cpp zm.cpp)
 
 target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
@@ -25,9 +24,8 @@ target_link_libraries(zmf zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(nph-zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zmstreamer zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
-target_link_libraries(zmfix ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 
-install(TARGETS zmc zma zmu zmf zmstreamer zmfix RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(TARGETS zmc zma zmu zmf zmstreamer RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(TARGETS zms nph-zms RUNTIME DESTINATION "${ZM_CGIDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -17,8 +17,7 @@ bin_PROGRAMS = \
 	zmu \
 	zms \
 	zmf \
-	zmstreamer \
-	zmfix
+	zmstreamer
 
 zm_SOURCES = \
 	zm_box.cpp \
@@ -66,7 +65,6 @@ zms_SOURCES = zms.cpp $(zm_SOURCES)
 zmu_SOURCES = zmu.cpp $(zm_SOURCES)
 zmf_SOURCES = zmf.cpp $(zm_SOURCES)
 zmstreamer_SOURCES = zmstreamer.cpp $(zm_SOURCES)
-zmfix_SOURCES = zmfix.cpp zm_config.cpp zm_regexp.cpp zm_logger.cpp zm_utils.cpp zm_db.cpp zm.cpp
 
 noinst_HEADERS = \
 	jinclude.h \
@@ -126,7 +124,6 @@ dist-hook:
 install-exec-hook:
 	( cd $(DESTDIR)@bindir@; mkdir -p $(DESTDIR)$(cgidir); mv zms $(DESTDIR)$(cgidir) )
 	( cd $(DESTDIR)$(cgidir); chown $(webuser):$(webgroup) zms; ln -f zms nph-zms )
-	( cd $(DESTDIR)@bindir@; chmod u+s zmfix )
 
 uninstall-hook:
 	( cd $(DESTDIR)$(cgidir); rm -f zms nph-zms )

diff --git a/src/zmfix.cpp b/src/zmfix.cpp
diff --git a/web/includes/actions.php b/web/includes/actions.php
@@ -554,7 +554,6 @@ function getAffectedIds( $name )
             if ( $restart )
             {
                 $monitor = dbFetchOne( "select * from Monitors where Id = '".dbEscape($mid)."'" );
-                fixDevices();
                 //if ( $cookies )
                     //session_write_close();
                 if ( daemonCheck() )

diff --git a/web/includes/functions.php b/web/includes/functions.php
@@ -916,13 +916,6 @@ function canStream()
     return( canStreamNative() | canStreamApplet() );
 }
 
-function fixDevices()
-{
-    $string = ZM_PATH_BIN."/zmfix";
-    $string .= " 2>/dev/null >&- <&- >/dev/null";
-    exec( $string );
-}
-
 function packageControl( $command )
 {
     $string = ZM_PATH_BIN.'/zmpkg.pl '.escapeshellarg( $command );