IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4691


Ignore:
Timestamp:
Aug 1, 2005, 4:03:32 AM (21 years ago)
Author:
eugene
Message:

fixed help bugs, scheduler fixes

Location:
trunk/Ohana/src/opihi
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/dvo/Makefile

    r4689 r4691  
    159159        rm -f $(HOME)/$*/help/*~
    160160        rm -f $(HOME)/$*/help/#*
    161         cp $(HOME)/$*/help/* $(DESTHLP)/
     161        for i in `find $(HOME)/$*/help -type f -maxdepth 1`; do cp -f $$i $(DESTHLP); done
    162162
    163163## -*- makefile -*-

  • trunk/Ohana/src/opihi/mana/Makefile

    r4689 r4691  
    111111        rm -f $(HOME)/$*/help/*~
    112112        rm -f $(HOME)/$*/help/#*
    113         cp $(HOME)/$*/help/* $(DESTHLP)/
     113        for i in `find $(HOME)/$*/help -type f -maxdepth 1`; do cp -f $$i $(DESTHLP); done

  • trunk/Ohana/src/opihi/pantasks/LocalJob.c

    r4689 r4691  
    102102  int result, waitstatus;
    103103
    104   fprintf (stderr, "checking on %d\n", job[0].pid);
    105 
    106104  /* check local job status */
    107105  result = waitpid (job[0].pid, &waitstatus, WNOHANG);
    … …  
    137135        exit (1);
    138136      }
    139       fprintf (stderr, "waited for %d\n", result);
    140      
    141137      if (WIFEXITED(waitstatus)) {
    142138        job[0].state = JOB_EXIT;

  • trunk/Ohana/src/opihi/pantasks/Makefile

    r4689 r4691  
    133133        rm -f $(HOME)/$*/help/*~
    134134        rm -f $(HOME)/$*/help/#*
    135         cp $(HOME)/$*/help/* $(DESTHLP)/
     135        for i in `find $(HOME)/$*/help -type f -maxdepth 1`; do cp -f $$i $(DESTHLP); done

  • trunk/Ohana/src/opihi/pclient/Makefile

    r4689 r4691  
    1818LFLAGS  =       -L$(LLIB) -L$(LIB)
    1919LIBS1   =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
    20 LIBS2   =       -lbasiccmd -ldatacmd -lshell -ldata
     20LIBS2   =       -lbasiccmd -lshell -ldata
    2121LIBS    =       $(LIBS2) $(LIBS1)
    2222CFLAGS  =       $(INCS)
    … …  
    4242libs = \
    4343$(DESTLIB)/libbasiccmd.a \
    44 $(DESTLIB)/libdatacmd.a \
    4544$(DESTLIB)/libshell.a \
    4645$(DESTLIB)/libdata.a
    … …  
    112111        rm -f $(HOME)/$*/help/*~
    113112        rm -f $(HOME)/$*/help/#*
    114         cp $(HOME)/$*/help/* $(DESTHLP)/
     113        for i in `find $(HOME)/$*/help -type f -maxdepth 1`; do cp -f $$i $(DESTHLP); done

  • trunk/Ohana/src/opihi/pclient/job.c

    r4573 r4691  
    2727    targv[i-1] = strcreate (argv[i]);
    2828  }
    29   targv[i] = 0;
     29  targv[i-1] = 0;
    3030
    3131  pid = fork ();
    3232  if (!pid) { /* must be child process */
    33     fprintf (stderr, "starting child process %s...\n", argv[1]);
     33    fprintf (stderr, "starting child process %s...\n", targv[0]);
    3434
    3535    /* close the other ends of the pipes */
    … …  
    5353    exit (1);
    5454  }
     55
     56  /* free temporary arg list */
     57  for (i = 0; i < argc - 1; i++) {
     58    free (targv[i]);
     59  }
     60  free (targv);
    5561
    5662  /* close the other ends of the pipes */

  • trunk/Ohana/src/opihi/pclient/pclient.c

    r4689 r4691  
    2929  /* load the commands used by this implementation */
    3030  InitBasic ();
    31   InitData ();
    3231  InitOutfile ();
    3332  InitPclient ();

  • trunk/Ohana/src/opihi/pcontrol/Makefile

    r4689 r4691  
    1818LFLAGS  =       -L$(LLIB) -L$(LIB)
    1919LIBS1   =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
    20 LIBS2   =       -lbasiccmd -ldatacmd -lshell -ldata
     20LIBS2   =       -lbasiccmd -lshell -ldata
    2121LIBS    =       $(LIBS2) $(LIBS1)
    2222CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
    … …  
    6262libs = \
    6363$(DESTLIB)/libbasiccmd.a \
    64 $(DESTLIB)/libdatamd.a \
    6564$(DESTLIB)/libshell.a \
    6665$(DESTLIB)/libdata.a
    … …  
    132131        rm -f $(HOME)/$*/help/*~
    133132        rm -f $(HOME)/$*/help/#*
    134         cp $(HOME)/$*/help/* $(DESTHLP)/
     133        for i in `find $(HOME)/$*/help -type f -maxdepth 1`; do cp -f $$i $(DESTHLP); done

  • trunk/Ohana/src/opihi/pcontrol/pcontrol.c

    r4689 r4691  
    2929  /* load the commands used by this implementation */
    3030  InitBasic ();
    31   InitData ();
    3231  InitOutfile ();
    3332  InitPcontrol ();

  • trunk/Ohana/src/opihi/scripts/sched.pro

    r4602 r4691  
    11
    2 # controller host localhost
     2controller host alala
    33
    44task test
Note: See TracChangeset for help on using the changeset viewer.