Browse code

-Wall で警告がでないように修正

Masanobu Yasui authored on 2012/08/21 21:09:51
Showing 11 changed files
... ...
@@ -1,6 +1,7 @@
1 1
 bin_PROGRAMS = msync
2 2
 sbin_PROGRAMS = makuosan
3 3
 makuosan_SOURCES = makuosan.c common.c mexec.c minit.c mexit.c mrecv.c msend.c xprint.c makuosan.h
4
-msync_SOURCES = msync.c 
5
-EXTRA_DIST = support ChangeLog.ja
6
-
4
+msync_SOURCES = msync.c
5
+makuosan_CFLAGS = -Wall
6
+msync_CFLAGS = -Wall
7
+EXTRA_DIST = support ChangeLog.ja Changelog
... ...
@@ -51,14 +51,20 @@ CONFIG_CLEAN_FILES =
51 51
 CONFIG_CLEAN_VPATH_FILES =
52 52
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
53 53
 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
54
-am_makuosan_OBJECTS = makuosan.$(OBJEXT) common.$(OBJEXT) \
55
-	mexec.$(OBJEXT) minit.$(OBJEXT) mexit.$(OBJEXT) \
56
-	mrecv.$(OBJEXT) msend.$(OBJEXT) xprint.$(OBJEXT)
54
+am_makuosan_OBJECTS = makuosan-makuosan.$(OBJEXT) \
55
+	makuosan-common.$(OBJEXT) makuosan-mexec.$(OBJEXT) \
56
+	makuosan-minit.$(OBJEXT) makuosan-mexit.$(OBJEXT) \
57
+	makuosan-mrecv.$(OBJEXT) makuosan-msend.$(OBJEXT) \
58
+	makuosan-xprint.$(OBJEXT)
57 59
 makuosan_OBJECTS = $(am_makuosan_OBJECTS)
58 60
 makuosan_LDADD = $(LDADD)
59
-am_msync_OBJECTS = msync.$(OBJEXT)
61
+makuosan_LINK = $(CCLD) $(makuosan_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
62
+	$(LDFLAGS) -o $@
63
+am_msync_OBJECTS = msync-msync.$(OBJEXT)
60 64
 msync_OBJECTS = $(am_msync_OBJECTS)
61 65
 msync_LDADD = $(LDADD)
66
+msync_LINK = $(CCLD) $(msync_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
67
+	$(LDFLAGS) -o $@
62 68
 DEFAULT_INCLUDES = -I.@am__isrc@
63 69
 depcomp = $(SHELL) $(top_srcdir)/depcomp
64 70
 am__depfiles_maybe = depfiles
... ...
@@ -170,8 +176,10 @@ top_build_prefix = @top_build_prefix@
170 170
 top_builddir = @top_builddir@
171 171
 top_srcdir = @top_srcdir@
172 172
 makuosan_SOURCES = makuosan.c common.c mexec.c minit.c mexit.c mrecv.c msend.c xprint.c makuosan.h
173
-msync_SOURCES = msync.c 
174
-EXTRA_DIST = support ChangeLog.ja
173
+msync_SOURCES = msync.c
174
+makuosan_CFLAGS = -Wall
175
+msync_CFLAGS = -Wall
176
+EXTRA_DIST = support ChangeLog.ja Changelog
175 177
 all: config.h
176 178
 	$(MAKE) $(AM_MAKEFLAGS) all-am
177 179
 
... ...
@@ -304,10 +312,10 @@ clean-sbinPROGRAMS:
304 304
 	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
305 305
 makuosan$(EXEEXT): $(makuosan_OBJECTS) $(makuosan_DEPENDENCIES) 
306 306
 	@rm -f makuosan$(EXEEXT)
307
-	$(LINK) $(makuosan_OBJECTS) $(makuosan_LDADD) $(LIBS)
307
+	$(makuosan_LINK) $(makuosan_OBJECTS) $(makuosan_LDADD) $(LIBS)
308 308
 msync$(EXEEXT): $(msync_OBJECTS) $(msync_DEPENDENCIES) 
309 309
 	@rm -f msync$(EXEEXT)
310
-	$(LINK) $(msync_OBJECTS) $(msync_LDADD) $(LIBS)
310
+	$(msync_LINK) $(msync_OBJECTS) $(msync_LDADD) $(LIBS)
311 311
 
312 312
 mostlyclean-compile:
313 313
 	-rm -f *.$(OBJEXT)
... ...
@@ -315,15 +323,15 @@ mostlyclean-compile:
315 315
 distclean-compile:
316 316
 	-rm -f *.tab.c
317 317
 
318
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@
319
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makuosan.Po@am__quote@
320
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mexec.Po@am__quote@
321
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mexit.Po@am__quote@
322
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minit.Po@am__quote@
323
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mrecv.Po@am__quote@
324
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msend.Po@am__quote@
325
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msync.Po@am__quote@
326
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xprint.Po@am__quote@
318
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makuosan-common.Po@am__quote@
319
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makuosan-makuosan.Po@am__quote@
320
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makuosan-mexec.Po@am__quote@
321
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makuosan-mexit.Po@am__quote@
322
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makuosan-minit.Po@am__quote@
323
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makuosan-mrecv.Po@am__quote@
324
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makuosan-msend.Po@am__quote@
325
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makuosan-xprint.Po@am__quote@
326
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msync-msync.Po@am__quote@
327 327
 
328 328
 .c.o:
329 329
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -339,6 +347,132 @@ distclean-compile:
339 339
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
340 340
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
341 341
 
342
+makuosan-makuosan.o: makuosan.c
343
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-makuosan.o -MD -MP -MF $(DEPDIR)/makuosan-makuosan.Tpo -c -o makuosan-makuosan.o `test -f 'makuosan.c' || echo '$(srcdir)/'`makuosan.c
344
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-makuosan.Tpo $(DEPDIR)/makuosan-makuosan.Po
345
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='makuosan.c' object='makuosan-makuosan.o' libtool=no @AMDEPBACKSLASH@
346
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
347
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-makuosan.o `test -f 'makuosan.c' || echo '$(srcdir)/'`makuosan.c
348
+
349
+makuosan-makuosan.obj: makuosan.c
350
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-makuosan.obj -MD -MP -MF $(DEPDIR)/makuosan-makuosan.Tpo -c -o makuosan-makuosan.obj `if test -f 'makuosan.c'; then $(CYGPATH_W) 'makuosan.c'; else $(CYGPATH_W) '$(srcdir)/makuosan.c'; fi`
351
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-makuosan.Tpo $(DEPDIR)/makuosan-makuosan.Po
352
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='makuosan.c' object='makuosan-makuosan.obj' libtool=no @AMDEPBACKSLASH@
353
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
354
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-makuosan.obj `if test -f 'makuosan.c'; then $(CYGPATH_W) 'makuosan.c'; else $(CYGPATH_W) '$(srcdir)/makuosan.c'; fi`
355
+
356
+makuosan-common.o: common.c
357
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-common.o -MD -MP -MF $(DEPDIR)/makuosan-common.Tpo -c -o makuosan-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c
358
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-common.Tpo $(DEPDIR)/makuosan-common.Po
359
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='common.c' object='makuosan-common.o' libtool=no @AMDEPBACKSLASH@
360
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
361
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c
362
+
363
+makuosan-common.obj: common.c
364
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-common.obj -MD -MP -MF $(DEPDIR)/makuosan-common.Tpo -c -o makuosan-common.obj `if test -f 'common.c'; then $(CYGPATH_W) 'common.c'; else $(CYGPATH_W) '$(srcdir)/common.c'; fi`
365
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-common.Tpo $(DEPDIR)/makuosan-common.Po
366
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='common.c' object='makuosan-common.obj' libtool=no @AMDEPBACKSLASH@
367
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
368
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-common.obj `if test -f 'common.c'; then $(CYGPATH_W) 'common.c'; else $(CYGPATH_W) '$(srcdir)/common.c'; fi`
369
+
370
+makuosan-mexec.o: mexec.c
371
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-mexec.o -MD -MP -MF $(DEPDIR)/makuosan-mexec.Tpo -c -o makuosan-mexec.o `test -f 'mexec.c' || echo '$(srcdir)/'`mexec.c
372
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-mexec.Tpo $(DEPDIR)/makuosan-mexec.Po
373
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mexec.c' object='makuosan-mexec.o' libtool=no @AMDEPBACKSLASH@
374
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
375
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-mexec.o `test -f 'mexec.c' || echo '$(srcdir)/'`mexec.c
376
+
377
+makuosan-mexec.obj: mexec.c
378
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-mexec.obj -MD -MP -MF $(DEPDIR)/makuosan-mexec.Tpo -c -o makuosan-mexec.obj `if test -f 'mexec.c'; then $(CYGPATH_W) 'mexec.c'; else $(CYGPATH_W) '$(srcdir)/mexec.c'; fi`
379
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-mexec.Tpo $(DEPDIR)/makuosan-mexec.Po
380
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mexec.c' object='makuosan-mexec.obj' libtool=no @AMDEPBACKSLASH@
381
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
382
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-mexec.obj `if test -f 'mexec.c'; then $(CYGPATH_W) 'mexec.c'; else $(CYGPATH_W) '$(srcdir)/mexec.c'; fi`
383
+
384
+makuosan-minit.o: minit.c
385
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-minit.o -MD -MP -MF $(DEPDIR)/makuosan-minit.Tpo -c -o makuosan-minit.o `test -f 'minit.c' || echo '$(srcdir)/'`minit.c
386
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-minit.Tpo $(DEPDIR)/makuosan-minit.Po
387
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='minit.c' object='makuosan-minit.o' libtool=no @AMDEPBACKSLASH@
388
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
389
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-minit.o `test -f 'minit.c' || echo '$(srcdir)/'`minit.c
390
+
391
+makuosan-minit.obj: minit.c
392
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-minit.obj -MD -MP -MF $(DEPDIR)/makuosan-minit.Tpo -c -o makuosan-minit.obj `if test -f 'minit.c'; then $(CYGPATH_W) 'minit.c'; else $(CYGPATH_W) '$(srcdir)/minit.c'; fi`
393
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-minit.Tpo $(DEPDIR)/makuosan-minit.Po
394
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='minit.c' object='makuosan-minit.obj' libtool=no @AMDEPBACKSLASH@
395
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
396
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-minit.obj `if test -f 'minit.c'; then $(CYGPATH_W) 'minit.c'; else $(CYGPATH_W) '$(srcdir)/minit.c'; fi`
397
+
398
+makuosan-mexit.o: mexit.c
399
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-mexit.o -MD -MP -MF $(DEPDIR)/makuosan-mexit.Tpo -c -o makuosan-mexit.o `test -f 'mexit.c' || echo '$(srcdir)/'`mexit.c
400
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-mexit.Tpo $(DEPDIR)/makuosan-mexit.Po
401
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mexit.c' object='makuosan-mexit.o' libtool=no @AMDEPBACKSLASH@
402
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
403
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-mexit.o `test -f 'mexit.c' || echo '$(srcdir)/'`mexit.c
404
+
405
+makuosan-mexit.obj: mexit.c
406
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-mexit.obj -MD -MP -MF $(DEPDIR)/makuosan-mexit.Tpo -c -o makuosan-mexit.obj `if test -f 'mexit.c'; then $(CYGPATH_W) 'mexit.c'; else $(CYGPATH_W) '$(srcdir)/mexit.c'; fi`
407
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-mexit.Tpo $(DEPDIR)/makuosan-mexit.Po
408
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mexit.c' object='makuosan-mexit.obj' libtool=no @AMDEPBACKSLASH@
409
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
410
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-mexit.obj `if test -f 'mexit.c'; then $(CYGPATH_W) 'mexit.c'; else $(CYGPATH_W) '$(srcdir)/mexit.c'; fi`
411
+
412
+makuosan-mrecv.o: mrecv.c
413
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-mrecv.o -MD -MP -MF $(DEPDIR)/makuosan-mrecv.Tpo -c -o makuosan-mrecv.o `test -f 'mrecv.c' || echo '$(srcdir)/'`mrecv.c
414
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-mrecv.Tpo $(DEPDIR)/makuosan-mrecv.Po
415
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mrecv.c' object='makuosan-mrecv.o' libtool=no @AMDEPBACKSLASH@
416
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
417
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-mrecv.o `test -f 'mrecv.c' || echo '$(srcdir)/'`mrecv.c
418
+
419
+makuosan-mrecv.obj: mrecv.c
420
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-mrecv.obj -MD -MP -MF $(DEPDIR)/makuosan-mrecv.Tpo -c -o makuosan-mrecv.obj `if test -f 'mrecv.c'; then $(CYGPATH_W) 'mrecv.c'; else $(CYGPATH_W) '$(srcdir)/mrecv.c'; fi`
421
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-mrecv.Tpo $(DEPDIR)/makuosan-mrecv.Po
422
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mrecv.c' object='makuosan-mrecv.obj' libtool=no @AMDEPBACKSLASH@
423
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
424
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-mrecv.obj `if test -f 'mrecv.c'; then $(CYGPATH_W) 'mrecv.c'; else $(CYGPATH_W) '$(srcdir)/mrecv.c'; fi`
425
+
426
+makuosan-msend.o: msend.c
427
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-msend.o -MD -MP -MF $(DEPDIR)/makuosan-msend.Tpo -c -o makuosan-msend.o `test -f 'msend.c' || echo '$(srcdir)/'`msend.c
428
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-msend.Tpo $(DEPDIR)/makuosan-msend.Po
429
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='msend.c' object='makuosan-msend.o' libtool=no @AMDEPBACKSLASH@
430
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
431
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-msend.o `test -f 'msend.c' || echo '$(srcdir)/'`msend.c
432
+
433
+makuosan-msend.obj: msend.c
434
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-msend.obj -MD -MP -MF $(DEPDIR)/makuosan-msend.Tpo -c -o makuosan-msend.obj `if test -f 'msend.c'; then $(CYGPATH_W) 'msend.c'; else $(CYGPATH_W) '$(srcdir)/msend.c'; fi`
435
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-msend.Tpo $(DEPDIR)/makuosan-msend.Po
436
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='msend.c' object='makuosan-msend.obj' libtool=no @AMDEPBACKSLASH@
437
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
438
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-msend.obj `if test -f 'msend.c'; then $(CYGPATH_W) 'msend.c'; else $(CYGPATH_W) '$(srcdir)/msend.c'; fi`
439
+
440
+makuosan-xprint.o: xprint.c
441
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-xprint.o -MD -MP -MF $(DEPDIR)/makuosan-xprint.Tpo -c -o makuosan-xprint.o `test -f 'xprint.c' || echo '$(srcdir)/'`xprint.c
442
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-xprint.Tpo $(DEPDIR)/makuosan-xprint.Po
443
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xprint.c' object='makuosan-xprint.o' libtool=no @AMDEPBACKSLASH@
444
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
445
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-xprint.o `test -f 'xprint.c' || echo '$(srcdir)/'`xprint.c
446
+
447
+makuosan-xprint.obj: xprint.c
448
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -MT makuosan-xprint.obj -MD -MP -MF $(DEPDIR)/makuosan-xprint.Tpo -c -o makuosan-xprint.obj `if test -f 'xprint.c'; then $(CYGPATH_W) 'xprint.c'; else $(CYGPATH_W) '$(srcdir)/xprint.c'; fi`
449
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/makuosan-xprint.Tpo $(DEPDIR)/makuosan-xprint.Po
450
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xprint.c' object='makuosan-xprint.obj' libtool=no @AMDEPBACKSLASH@
451
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
452
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makuosan_CFLAGS) $(CFLAGS) -c -o makuosan-xprint.obj `if test -f 'xprint.c'; then $(CYGPATH_W) 'xprint.c'; else $(CYGPATH_W) '$(srcdir)/xprint.c'; fi`
453
+
454
+msync-msync.o: msync.c
455
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(msync_CFLAGS) $(CFLAGS) -MT msync-msync.o -MD -MP -MF $(DEPDIR)/msync-msync.Tpo -c -o msync-msync.o `test -f 'msync.c' || echo '$(srcdir)/'`msync.c
456
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/msync-msync.Tpo $(DEPDIR)/msync-msync.Po
457
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='msync.c' object='msync-msync.o' libtool=no @AMDEPBACKSLASH@
458
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
459
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(msync_CFLAGS) $(CFLAGS) -c -o msync-msync.o `test -f 'msync.c' || echo '$(srcdir)/'`msync.c
460
+
461
+msync-msync.obj: msync.c
462
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(msync_CFLAGS) $(CFLAGS) -MT msync-msync.obj -MD -MP -MF $(DEPDIR)/msync-msync.Tpo -c -o msync-msync.obj `if test -f 'msync.c'; then $(CYGPATH_W) 'msync.c'; else $(CYGPATH_W) '$(srcdir)/msync.c'; fi`
463
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/msync-msync.Tpo $(DEPDIR)/msync-msync.Po
464
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='msync.c' object='msync-msync.obj' libtool=no @AMDEPBACKSLASH@
465
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
466
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(msync_CFLAGS) $(CFLAGS) -c -o msync-msync.obj `if test -f 'msync.c'; then $(CYGPATH_W) 'msync.c'; else $(CYGPATH_W) '$(srcdir)/msync.c'; fi`
467
+
342 468
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
343 469
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
344 470
 	unique=`for i in $$list; do \
... ...
@@ -167,14 +167,18 @@ void mfdel(mfile *m)
167 167
   mfile *p;
168 168
   mfile *n;
169 169
   if(m){
170
-    if(p = (mfile *)m->prev)
170
+    if((p = (mfile *)m->prev)){
171 171
       p->next = m->next;
172
-    if(n = (mfile *)m->next)
172
+    }
173
+    if((n = (mfile *)m->next)){
173 174
       n->prev = m->prev;
174
-    if(mftop[0] == m)
175
+    }
176
+    if(mftop[0] == m){
175 177
       mftop[0] = n;
176
-    if(mftop[1] == m)
178
+    }
179
+    if(mftop[1] == m){
177 180
       mftop[1] = n;
181
+    }
178 182
     mfree(m);
179 183
   }
180 184
 }
... ...
@@ -182,7 +186,7 @@ void mfdel(mfile *m)
182 182
 mfile *mfnew()
183 183
 {
184 184
   mfile *m;
185
-  if(m = mfalloc()){
185
+  if((m = mfalloc())){
186 186
     memset(m, 0, sizeof(mfile));
187 187
     m->mdata.head.maddr  = moption.maddr.sin_addr.s_addr;
188 188
     m->mdata.head.mport  = moption.maddr.sin_port;
... ...
@@ -198,7 +202,7 @@ mfile *mfnew()
198 198
 mfile *mfadd(int n)
199 199
 {
200 200
   mfile *m;
201
-  if(m = mfnew()){
201
+  if((m = mfnew())){
202 202
     if(!mftop[n]){
203 203
       mftop[n] =m;
204 204
     }else{
... ...
@@ -215,7 +219,7 @@ mfile *mfadd(int n)
215 215
 mfile *mfins(int n)
216 216
 {
217 217
   mfile *m;
218
-  if(m = mfnew()){
218
+  if((m = mfnew())){
219 219
     if(mftop[n]){
220 220
       mftop[n]->prev = m;
221 221
       m->next = mftop[n];
... ...
@@ -287,10 +291,10 @@ void member_del(mhost *t)
287 287
     return;
288 288
   }
289 289
   lprintf(0, "%s: %s (%s)\n", __func__, inet_ntoa(t->ad), t->hostname);
290
-  if(p = (mhost *)t->prev){
290
+  if((p = (mhost *)t->prev)){
291 291
     p->next = t->next;
292 292
   }
293
-  if(n = (mhost *)t->next){
293
+  if((n = (mhost *)t->next)){
294 294
     n->prev = t->prev;
295 295
   }
296 296
   if(members == t){
... ...
@@ -308,7 +312,7 @@ void member_del_message(int err, mhost *t, char *mess)
308 308
     return;
309 309
   }
310 310
   for(i=0;i<MAKUO_HOSTSTATE_SIZE;i++){
311
-    if(m = t->mflist[i]){
311
+    if((m = t->mflist[i])){
312 312
       if(m->comm){
313 313
         if(m->comm->working){
314 314
           cprintf(0, m->comm, "error: %s: %s\n", mess, m->cmdline);
... ...
@@ -461,7 +465,7 @@ void seq_setmark(mfile *m, uint32_t l, uint32_t h)
461 461
     }
462 462
     mm = delmark(mm);
463 463
   }
464
-  if(mn->next = m->mark){
464
+  if((mn->next = m->mark)){
465 465
     m->mark->prev = mn;
466 466
   }
467 467
   m->mark = mn;
... ...
@@ -508,7 +512,7 @@ void dump_hoststate(mfile *m, char *func)
508 508
   mhost   *t;
509 509
   uint8_t *r;
510 510
   for(t=members;t;t=t->next){
511
-    if(r=get_hoststate(t,m)){
511
+    if((r=get_hoststate(t,m))){
512 512
       lprintf(9,"%s: %s from %s %s\n", func, strrstate(*r), t->hostname, m->fn);
513 513
     }
514 514
   }
... ...
@@ -541,7 +545,7 @@ uint8_t *get_hoststate(mhost *t, mfile *m)
541 541
 uint8_t *set_hoststate(mhost *t, mfile *m, uint8_t state)
542 542
 {
543 543
   uint8_t *s;
544
-  if(s = get_hoststate(t,m)){
544
+  if((s = get_hoststate(t,m))){
545 545
     *s = state;
546 546
   }
547 547
   return(s);
... ...
@@ -553,14 +557,14 @@ int ack_clear(mfile *m, int state)
553 553
   mhost   *t;
554 554
   for(t=members;t;t=t->next){
555 555
     if(!m->sendto){
556
-      if(s = get_hoststate(t, m)){
556
+      if((s = get_hoststate(t, m))){
557 557
         if(state == -1 || *s == state){
558 558
           *s = MAKUO_RECVSTATE_NONE;
559 559
         }
560 560
       }
561 561
     }else{
562 562
       if(!memcmp(&(m->addr.sin_addr), &(t->ad), sizeof(m->addr.sin_addr))){
563
-        if(s = get_hoststate(t, m)){
563
+        if((s = get_hoststate(t, m))){
564 564
           if(state == -1 || *s == state){
565 565
             *s = MAKUO_RECVSTATE_NONE;
566 566
             return(1);
... ...
@@ -757,8 +761,8 @@ int mremove(char *base, char *name)
757 757
     sprintf(path, "%s/%s", base, name);
758 758
   }
759 759
   if(is_dir(path)){
760
-    if(d = opendir(path)){
761
-      while(dent=readdir(d)){
760
+    if((d = opendir(path))){
761
+      while((dent=readdir(d))){
762 762
         if(!strcmp(dent->d_name, "."))
763 763
           continue;
764 764
         if(!strcmp(dent->d_name, ".."))
... ...
@@ -799,7 +803,7 @@ int mcreatedir(char *base, char *name, mode_t mode)
799 799
   while(p){
800 800
     strcat(path, "/");
801 801
     strcat(path, p);
802
-    if(p = strtok(NULL,"/")){
802
+    if((p = strtok(NULL,"/"))){
803 803
       if(!is_dir(path)){
804 804
         remove(path);
805 805
         if(mkdir(path,mode) == -1){
... ...
@@ -869,7 +873,7 @@ int space_escape(char *str)
869 869
 mfile *mkreq(mdata *data, struct sockaddr_in *addr, uint8_t state)
870 870
 {
871 871
   mfile *a;
872
-  if(a = mfins(MFSEND)){
872
+  if((a = mfins(MFSEND))){
873 873
     a->mdata.head.opcode = data->head.opcode;
874 874
     a->mdata.head.reqid  = data->head.reqid;
875 875
     a->mdata.head.seqno  = data->head.seqno;
... ...
@@ -892,7 +896,7 @@ mfile *mkack(mdata *data, struct sockaddr_in *addr, uint8_t state)
892 892
       return(a);
893 893
     }
894 894
   }
895
-  if(a = mfins(MFSEND)){
895
+  if((a = mfins(MFSEND))){
896 896
     a->mdata.head.flags |= MAKUO_FLAG_ACK;
897 897
     a->mdata.head.opcode = data->head.opcode;
898 898
     a->mdata.head.reqid  = data->head.reqid;
... ...
@@ -289,7 +289,6 @@ int do_accept(mcomm *c, fd_set *fds)
289 289
 
290 290
 int do_comexe(mcomm *c, fd_set *fds){
291 291
   int i, j;
292
-  mfile *m;
293 292
   for(i=0;i<MAX_COMM;i++){
294 293
     for(j=0;j<2;j++){
295 294
       if(c[i].fd[j] != -1){
... ...
@@ -402,4 +402,12 @@ uint32_t getrid();
402 402
 int space_escape(char *str);
403 403
 int workend(mcomm *c);
404 404
 char *yesno(int n);
405
-
405
+int is_dir(char *path);
406
+int is_reg(char *path);
407
+int mcreatenode(char *base, char *name, mode_t mode, dev_t dev);
408
+int mrename(char *base, char *oldname, char *newname);
409
+void mtempname(char *base, char *fn, char *tn);
410
+void minit(int argc, char *argv[]);
411
+void mexit();
412
+int mexec(mcomm *c, int n);
413
+void mrecv_gc();
... ...
@@ -22,6 +22,8 @@ char *command_list[]={"quit",
22 22
                       "help",
23 23
                       NULL};
24 24
 
25
+int mexec_scan_child(int fd, char *base, char *sendhost, int mode, mcomm *c, gid_t gid);
26
+
25 27
 mfile *mexec_with_dsync(mcomm *c, char *fn, int dryrun, int recurs, mhost *t)
26 28
 {
27 29
   mfile *m = mfadd(MFSEND);
... ...
@@ -153,7 +155,7 @@ int mexec_scan_dir(int fd, char *base, char *sendhost, int mode, mcomm *c, int b
153 153
     /* directory open error */
154 154
     mexec_scan_echo(fd, "directory open error %s", base);
155 155
   }else{
156
-    while(dent=readdir(d)){
156
+    while((dent=readdir(d))){
157 157
       if(!loop_flag){
158 158
         return(1);
159 159
       }
... ...
@@ -169,7 +171,7 @@ int mexec_scan_dir(int fd, char *base, char *sendhost, int mode, mcomm *c, int b
169 169
         strcpy(path, dent->d_name);
170 170
       }
171 171
       space_escape(path);
172
-      if(r = mexec_scan_child(fd, path, sendhost, mode, c, gid)){
172
+      if((r = mexec_scan_child(fd, path, sendhost, mode, c, gid))){
173 173
         return(r);
174 174
       }
175 175
     }
... ...
@@ -198,7 +200,7 @@ int mexec_scan_child(int fd, char *base, char *sendhost, int mode, mcomm *c, gid
198 198
         return(0);
199 199
       }
200 200
       /*----- scan dir -----*/
201
-      if(r = mexec_scan_dir(fd, base, sendhost, mode, c, 1, gid)){
201
+      if((r = mexec_scan_dir(fd, base, sendhost, mode, c, 1, gid))){
202 202
         return(r);
203 203
       }
204 204
       if(loop_flag && (mode != MAKUO_MEXEC_MD5)){
... ...
@@ -254,6 +256,21 @@ int mexec_scan(mcomm *c, char *fn, mhost *h, int mode, gid_t gid)
254 254
   return(0);
255 255
 }
256 256
 
257
+int mexec_exclude_add(mcomm *c, char *pattern)
258
+{
259
+  c->exclude = exclude_add(c->exclude, pattern);
260
+  return(0);
261
+}
262
+
263
+int mexec_exclude_del(mcomm *c, excludeitem *e)
264
+{
265
+  excludeitem *d = exclude_del(e);
266
+  if(e == c->exclude){
267
+    c->exclude = d;
268
+  }
269
+  return(0);
270
+}
271
+
257 272
 int mexec_open(int l, mcomm *c, int n)
258 273
 {
259 274
   if(n){
... ...
@@ -445,7 +462,7 @@ int mexec_send(mcomm *c, int n, int sync)
445 445
 
446 446
   if(fn){
447 447
     int len;
448
-    if(len = strlen(fn)){
448
+    if((len = strlen(fn))){
449 449
       if(fn[len - 1] == '/'){
450 450
         fn[len - 1] = 0;
451 451
       }
... ...
@@ -560,7 +577,6 @@ int mexec_check(mcomm *c, int n)
560 560
 {
561 561
   int e;
562 562
   int i;
563
-  ssize_t size;
564 563
   char *argv[9];
565 564
   char *fn = NULL;
566 565
   mfile *m = NULL;
... ...
@@ -668,7 +684,6 @@ int mexec_check(mcomm *c, int n)
668 668
 int mexec_dsync(mcomm *c, int n)
669 669
 {
670 670
   int i;
671
-  ssize_t size;
672 671
   char *argv[9];
673 672
   char *fn = NULL;
674 673
   mhost *t = NULL;
... ...
@@ -720,7 +735,7 @@ int mexec_dsync(mcomm *c, int n)
720 720
 
721 721
   if(fn){
722 722
     int len;
723
-    if(len = strlen(fn)){
723
+    if((len = strlen(fn))){
724 724
       if(fn[len - 1] == '/'){
725 725
         fn[len - 1] = 0;
726 726
       }
... ...
@@ -746,7 +761,6 @@ int mexec_members(mcomm *c, int n)
746 746
   int counter = 0;
747 747
   int namelen = 0;
748 748
   int addrlen = 0;
749
-  int statcnt = 0;
750 749
   mhost *t;
751 750
   mhost **pt;
752 751
   char form[256];
... ...
@@ -783,6 +797,7 @@ int mexec_members(mcomm *c, int n)
783 783
 
784 784
   /* view */
785 785
 #ifdef MAKUO_DEBUG
786
+  int statcnt = 0;
786 787
   sprintf(form, "%%-%ds %%-%ds (Ver%%s) STATE_AREA(%%d/%%d)\n", namelen, addrlen);
787 788
   for(i=0;i<counter;i++){
788 789
     statcnt = 0;
... ...
@@ -823,21 +838,6 @@ int mexec_loglevel(mcomm *c, int n)
823 823
   return(0);
824 824
 }
825 825
 
826
-int mexec_exclude_add(mcomm *c, char *pattern)
827
-{
828
-  c->exclude = exclude_add(c->exclude, pattern);
829
-  return(0);
830
-}
831
-
832
-int mexec_exclude_del(mcomm *c, excludeitem *e)
833
-{
834
-  excludeitem *d = exclude_del(e);
835
-  if(e == c->exclude){
836
-    c->exclude = d;
837
-  }
838
-  return(0);
839
-}
840
-
841 826
 int mexec_exclude(mcomm *c, int n)
842 827
 {
843 828
   excludeitem *e;
... ...
@@ -1072,7 +1072,7 @@ int mexec_parse(mcomm *c, int n)
1072 1072
         break;
1073 1073
       strcpy(c->parse[n][j], p);
1074 1074
       if(j){
1075
-        if(l = strlen(c->parse[n][j-1])){
1075
+        if((l = strlen(c->parse[n][j-1]))){
1076 1076
           if(c->parse[n][j-1][l-1] == '\\'){
1077 1077
             c->parse[n][j-1][l-1] = 0;
1078 1078
             strcat(c->parse[n][j-1], " ");
... ...
@@ -109,7 +109,7 @@ static int minit_option_setuid(char *name)
109 109
   if(*name >= '0' && *name <= '9'){
110 110
     moption.uid = atoi(name);
111 111
   }else{
112
-    if(pw = getpwnam(name)){
112
+    if((pw = getpwnam(name))){
113 113
       moption.uid = pw->pw_uid;
114 114
       moption.gid = pw->pw_gid;
115 115
     }else{
... ...
@@ -126,7 +126,7 @@ static int minit_option_setgid(char *name)
126 126
   if(*name >= '0' && *name <='9'){
127 127
     moption.gid = atoi(name);
128 128
   }else{
129
-    if(gr = getgrnam(name)){
129
+    if((gr = getgrnam(name))){
130 130
       moption.gid = gr->gr_gid;
131 131
     }else{
132 132
       lprintf(0,"[error] %s: not found group %s\n", __func__, name);
... ...
@@ -178,7 +178,7 @@ static int minit_option_setgids(char *name)
178 178
   while(p){
179 179
     if(*p >= '0' && *p <= '9'){
180 180
       gid = atoi(p);
181
-      if(g = getgrgid(gid)){
181
+      if((g = getgrgid(gid))){
182 182
         moption.gids[num] = gid;
183 183
         strcpy(moption.grnames[num], g->gr_name);
184 184
       }else{
... ...
@@ -186,7 +186,7 @@ static int minit_option_setgids(char *name)
186 186
         return(1);
187 187
       }
188 188
     }else{
189
-      if(g = getgrnam(p)){
189
+      if((g = getgrnam(p))){
190 190
         moption.gids[num] = g->gr_gid;
191 191
         strcpy(moption.grnames[num], p);
192 192
       }else{
... ...
@@ -203,42 +203,40 @@ static int minit_option_setgids(char *name)
203 203
 static void minit_option_getenv()
204 204
 {
205 205
   char *env;
206
-  struct passwd *pw;
207
-  struct group  *gr;
208 206
 
209
-  if(env=getenv("MAKUOSAN_BASE")){
207
+  if((env=getenv("MAKUOSAN_BASE"))){
210 208
     if(*env){
211 209
       realpath(env, moption.base_dir);
212 210
     }
213 211
   }
214
-  if(env=getenv("MAKUOSAN_PORT")){
212
+  if((env=getenv("MAKUOSAN_PORT"))){
215 213
     if(*env && atoi(env)){
216 214
       moption.maddr.sin_port = htons(atoi(env));
217 215
       moption.laddr.sin_port = htons(atoi(env));
218 216
     }
219 217
   }
220
-  if(env=getenv("MAKUOSAN_USER")){
218
+  if((env=getenv("MAKUOSAN_USER"))){
221 219
     if(*env && minit_option_setuid(env)){
222 220
       exit(1);
223 221
     }
224 222
   }
225
-  if(env=getenv("MAKUOSAN_GROUP")){
223
+  if((env=getenv("MAKUOSAN_GROUP"))){
226 224
     if(*env && minit_option_setgid(env)){
227 225
       exit(1);
228 226
     }
229 227
   }
230
-  if(env=getenv("MAKUOSAN_GROUPS")){
228
+  if((env=getenv("MAKUOSAN_GROUPS"))){
231 229
     if(*env && minit_option_setgids(env)){
232 230
       exit(1);
233 231
     }
234 232
   }
235
-  if(env=getenv("MAKUOSAN_SOCK")){
233
+  if((env=getenv("MAKUOSAN_SOCK"))){
236 234
     strcpy(moption.uaddr.sun_path, env);
237 235
   }
238
-  if(env=getenv("MAKUOSAN_RCVBUF")){
236
+  if((env=getenv("MAKUOSAN_RCVBUF"))){
239 237
     moption.recvsize = atoi(env);
240 238
   }
241
-  if(env=getenv("MAKUOSAN_SNDBUF")){
239
+  if((env=getenv("MAKUOSAN_SNDBUF"))){
242 240
     moption.sendsize = atoi(env);
243 241
   }
244 242
 }
... ...
@@ -312,10 +310,10 @@ static void minit_getopt(int argc, char *argv[])
312 312
 {
313 313
   int r;
314 314
   struct option opt[]={
315
-    "chroot",  0, NULL, 'c',
316
-    "help",    0, NULL, 'h',
317
-    "version", 0, NULL, 'V',
318
-    0, 0, 0, 0
315
+    {"chroot",  0, NULL, 'c'},
316
+    {"help",    0, NULL, 'h'},
317
+    {"version", 0, NULL, 'V'},
318
+    {0, 0, 0, 0}
319 319
   };
320 320
 
321 321
   while((r=getopt_long(argc, argv, "T:R:S:f:u:g:G:d:b:p:m:i:l:U:k:K:VhnsroOc", opt, NULL)) != -1){
... ...
@@ -446,9 +444,8 @@ static void minit_syslog()
446 446
 static void minit_socket()
447 447
 {
448 448
   int  s;
449
-  int  reuse =  1;
450
-  char lpen  =  0;
451
-  char mttl  =  1;
449
+  char lpen  = 0;
450
+  char mttl  = 1;
452 451
   socklen_t slen;
453 452
   struct ip_mreq mg;
454 453
   struct sockaddr_in addr;
... ...
@@ -594,10 +591,10 @@ static void minit_getguid()
594 594
 {
595 595
   struct passwd *pw;
596 596
   struct group  *gr;
597
-  if(pw = getpwuid(moption.uid)){
597
+  if((pw = getpwuid(moption.uid))){
598 598
     strcpy(moption.user_name, pw->pw_name);
599 599
   }
600
-  if(gr = getgrgid(moption.gid)){
600
+  if((gr = getgrgid(moption.gid))){
601 601
     strcpy(moption.group_name,gr->gr_name);
602 602
   }
603 603
 }
... ...
@@ -605,8 +602,6 @@ static void minit_getguid()
605 605
 static void minit_setguid()
606 606
 {
607 607
   size_t num;
608
-  struct passwd *pw;
609
-  struct group  *gr;
610 608
   if(set_guid(moption.uid, moption.gid, moption.gidn, moption.gids) == -1){
611 609
     fprintf(stderr, "%s: can't setguid %d:%d", __func__, moption.uid, moption.gid);
612 610
     if(moption.gidn){
... ...
@@ -30,7 +30,7 @@ static mfile *mrecv_mfdel(mfile *m)
30 30
     m->link->link = NULL;
31 31
     m->link = NULL;
32 32
   }
33
-  while(m->mark = delmark(m->mark));
33
+  while((m->mark = delmark(m->mark)));
34 34
   mfdel(m);
35 35
   return(r);
36 36
 }
... ...
@@ -417,7 +417,6 @@ static void mrecv_req_send_break(mfile *m, mdata *r)
417 417
 static void mrecv_req_send_stat(mfile *m, mdata *r)
418 418
 {
419 419
   struct stat fs;
420
-  struct utimbuf mftime;
421 420
 
422 421
   if(moption.dontrecv){
423 422
     m->mdata.head.nstate = MAKUO_RECVSTATE_READONLY;
... ...
@@ -805,7 +804,7 @@ static mfile *mrecv_req_send_create(mdata *data, struct sockaddr_in *addr)
805 805
   uint32_t  hdev;
806 806
   uint64_t  rdev;
807 807
 
808
-  if(m = mrecv_req_search(data, addr)){
808
+  if((m = mrecv_req_search(data, addr))){
809 809
     return(m);
810 810
   }
811 811
 
... ...
@@ -865,7 +864,7 @@ static mfile *mrecv_req_send_create(mdata *data, struct sockaddr_in *addr)
865 865
 static void mrecv_req_send(mdata *data, struct sockaddr_in *addr)
866 866
 {
867 867
   mfile *m;
868
-  if(m = mrecv_req_send_create(data, addr)){
868
+  if((m = mrecv_req_send_create(data, addr))){
869 869
     mtimeget(&(m->lastrecv));
870 870
     mrecv_req_send_next(m, data);
871 871
   }else{
... ...
@@ -1032,8 +1031,8 @@ static int dsync_scan(int fd, char *base, int recurs, excludeitem *e)
1032 1032
   }
1033 1033
 
1034 1034
   /*----- dir scan -----*/
1035
-  if(d = opendir(base)){
1036
-    while(dent=readdir(d)){
1035
+  if((d = opendir(base))){
1036
+    while((dent=readdir(d))){
1037 1037
       if(!loop_flag){
1038 1038
         break;
1039 1039
       }
... ...
@@ -1045,13 +1044,13 @@ static int dsync_scan(int fd, char *base, int recurs, excludeitem *e)
1045 1045
       }
1046 1046
       sprintf(path, "%s/%s", base, dent->d_name);
1047 1047
       if(recurs){
1048
-        if(r = dsync_scan(fd, path, recurs, e)){
1048
+        if((r = dsync_scan(fd, path, recurs, e))){
1049 1049
           closedir(d);
1050 1050
           return(r);
1051 1051
         }
1052 1052
       }else{
1053 1053
         len = strlen(path);
1054
-        if(r = dsync_write(fd, path, MAKUO_SENDSTATE_STAT, len, st.st_mode)){
1054
+        if((r = dsync_write(fd, path, MAKUO_SENDSTATE_STAT, len, st.st_mode))){
1055 1055
           closedir(d);
1056 1056
           return(r);
1057 1057
         }
... ...
@@ -1148,7 +1147,7 @@ static void mrecv_req_dsync_data(mfile *m, mdata *data, struct sockaddr_in *addr
1148 1148
     d->pid  = pid;
1149 1149
     d->pipe = p[0];
1150 1150
     close(p[1]); /* write close */
1151
-    while(d->exclude = exclude_del(d->exclude));
1151
+    while((d->exclude = exclude_del(d->exclude)));
1152 1152
   }else{
1153 1153
     /* child */
1154 1154
     close(p[0]); /* read close */
... ...
@@ -1214,7 +1213,6 @@ static void mrecv_req_del_open(mdata *data, struct sockaddr_in *addr)
1214 1214
 {
1215 1215
   uint16_t len;
1216 1216
   uint32_t mod;
1217
-  mhost *t = member_get(&(addr->sin_addr));
1218 1217
   mfile *a = mkack(data, addr, MAKUO_RECVSTATE_OPEN);
1219 1218
   char path[PATH_MAX];
1220 1219
 
... ...
@@ -1394,7 +1392,7 @@ void mrecv_gc()
1394 1394
 void mrecv_clean()
1395 1395
 {
1396 1396
   mfile *m = mftop[MFRECV];
1397
-  while(m=mrecv_mfdel(m));
1397
+  while((m = mrecv_mfdel(m)));
1398 1398
 }
1399 1399
 
1400 1400
 int mrecv()
... ...
@@ -1408,7 +1406,7 @@ int mrecv()
1408 1408
   if(mrecv_packet(moption.mcsocket, &data, &addr) == -1){
1409 1409
     return(0);
1410 1410
   }
1411
-  if(t = member_get(&addr.sin_addr)){
1411
+  if((t = member_get(&addr.sin_addr))){
1412 1412
     mtimeget(&(t->lastrecv));
1413 1413
   }
1414 1414
   if(data.head.flags & MAKUO_FLAG_ACK){
... ...
@@ -30,7 +30,7 @@ static mfile *msend_mfdel(mfile *m)
30 30
     m->link->link = NULL;
31 31
     m->link = NULL;
32 32
   }
33
-  while(m->mark = delmark(m->mark));
33
+  while((m->mark = delmark(m->mark)));
34 34
   clr_hoststate(m);
35 35
   mfdel(m);
36 36
   return(r);
... ...
@@ -151,7 +151,6 @@ static int msend_packet(int s, mdata *data, struct sockaddr_in *addr)
151 151
 /* retry */
152 152
 static int msend_retry(mfile *m)
153 153
 {
154
-  uint32_t w;
155 154
   uint8_t *r;
156 155
   mhost   *t;
157 156
 
... ...
@@ -220,8 +219,8 @@ static void msend_ack_send(int s, mfile *m)
220 220
 static void msend_ack_md5(int s, mfile *m)
221 221
 {
222 222
   int r;
223
-  char hash[16];
224
-  char buff[8192];
223
+  unsigned char hash[16];
224
+  unsigned char buff[8192];
225 225
   mfile *d = m->link;
226 226
   if(!d){
227 227
     msend_shot(s, m);
... ...
@@ -384,7 +383,7 @@ static void msend_req_send_stat_delete_report(mfile *m)
384 384
         continue;
385 385
       }
386 386
     }
387
-    if(r = get_hoststate(t, m)){
387
+    if((r = get_hoststate(t, m))){
388 388
       if(*r == MAKUO_RECVSTATE_DELETEOK){
389 389
         cprintf(1, m->comm, "%sdelete %s:%s\n", dryrun, t->hostname, m->fn);
390 390
         lprintf(1, "%sdelete %s:%s\n", dryrun, t->hostname, m->fn);
... ...
@@ -416,7 +415,7 @@ static void msend_req_send_stat_update_report(mfile *m)
416 416
         continue;
417 417
       }
418 418
     }
419
-    if(r = get_hoststate(t, m)){
419
+    if((r = get_hoststate(t, m))){
420 420
       if(*r == MAKUO_RECVSTATE_UPDATE){
421 421
         cprintf(1, m->comm, "%supdate %s:%s\r\n", dryrun, t->hostname, m->fn);
422 422
         lprintf(1, "%supdate %s:%s\n", dryrun, t->hostname, m->fn);
... ...
@@ -1016,7 +1015,7 @@ static void msend_req_del_stat_read(int s, mfile *m)
1016 1016
   }
1017 1017
 
1018 1018
   while(1){
1019
-    if(r = atomic_read(m->pipe, &(m->len), sizeof(m->len), 1)){
1019
+    if((r = atomic_read(m->pipe, &(m->len), sizeof(m->len), 1))){
1020 1020
       if(r == -1){
1021 1021
         if(errno == EAGAIN){
1022 1022
           return;
... ...
@@ -1252,6 +1251,6 @@ void msend(mfile *m)
1252 1252
 void msend_clean()
1253 1253
 {
1254 1254
   mfile *m = mftop[MFSEND];
1255
-  while(m=msend_mfdel(m));
1255
+  while((m = msend_mfdel(m)));
1256 1256
 }
1257 1257
 
... ...
@@ -223,7 +223,7 @@ int readline(int s, char *buff, int size, int prompt, char *passwd)
223 223
 int wait_prompt(int s, char *passwd, int view, int *line){
224 224
   int  r;
225 225
   char buff[8192];
226
-  while(r = readline(s, buff, sizeof(buff), 1, passwd)){
226
+  while((r = readline(s, buff, sizeof(buff), 1, passwd))){
227 227
     if(r == -1){
228 228
       /* read error */
229 229
       r = -1;
... ...
@@ -397,7 +397,7 @@ int exclude_from(msyncdata *md, char *filename)
397 397
     fprintf(stderr,"can't open: %s\n", filename);
398 398
     return(1);
399 399
   }
400
-  while(r = readline(f, line, sizeof(line), 0, NULL)){
400
+  while((r = readline(f, line, sizeof(line), 0, NULL))){
401 401
     if(r == -1){
402 402
       fprintf(stderr, "file read error: %s\n", filename);
403 403
       close(f);
... ...
@@ -434,7 +434,7 @@ int makuo_file(msyncdata *md)
434 434
   }
435 435
 
436 436
   /* command read loop */
437
-  while(r = readline(f, line, sizeof(line), 0, NULL)){
437
+  while((r = readline(f, line, sizeof(line), 0, NULL))){
438 438
     if(r == -1){
439 439
       fprintf(stderr, "file read error: %s\n", filename);
440 440
       break;
... ...
@@ -469,11 +469,11 @@ int loadpass(char *filename, char *passwd, int size)
469 469
 void get_envopt(msyncdata *md)
470 470
 {
471 471
   char *p;
472
-  if(p = getenv("MSYNC_TARGET")){
472
+  if((p = getenv("MSYNC_TARGET"))){
473 473
     if(strlen(p) < sizeof(md->target)){
474 474
       strcpy(md->target, p);
475 475
     }else{
476
-      fprintf(stderr, "MSYNC_TARGET too long. %s\n");
476
+      fprintf(stderr, "MSYNC_TARGET too long. %s\n", p);
477 477
       exit(1);
478 478
     }
479 479
   }
... ...
@@ -149,7 +149,6 @@ void fdprintf(int s, char *fmt, ...)
149 149
 void lprintf(int l, char *fmt, ...)
150 150
 {
151 151
   va_list arg;
152
-  struct timeval tv;
153 152
   char b[1024];
154 153
   char d[2048];
155 154
   static char m[2048];
... ...
@@ -168,6 +167,7 @@ void lprintf(int l, char *fmt, ...)
168 168
     return;
169 169
   }
170 170
 #ifdef MAKUO_DEBUG
171
+  struct timeval tv;
171 172
   gettimeofday(&tv, NULL);
172 173
   fprintf(stderr, "%02d.%06d %s", tv.tv_sec % 60, tv.tv_usec, m);
173 174
 #else
... ...
@@ -179,7 +179,6 @@ void lprintf(int l, char *fmt, ...)
179 179
 
180 180
 int cprintf(int l, mcomm *c, char *fmt, ...)
181 181
 {
182
-  int r;
183 182
   int n;
184 183
   char m[2048];
185 184
   va_list arg;