diff --git a/src/j3/Phttpd.java b/src/j3/Phttpd.java index 0cd8d0c..1cf4eae 100644 --- a/src/j3/Phttpd.java +++ b/src/j3/Phttpd.java @@ -21,7 +21,7 @@ Socket sock ; // 入出力 - DataOutputStream dout; + DataOutputStream dostr; BufferedReader in ; FileInputStream infile = null; byte[] buff = new byte[1024]; @@ -48,9 +48,8 @@ System.exit(1) ; } // 読み書き用オブジェクトの生成 - in = new BufferedReader(new - InputStreamReader(sock.getInputStream())); - dout = new DataOutputStream(sock.getOutputStream() ); + in = new BufferedReader(new InputStreamReader(sock.getInputStream())); + dostr = new DataOutputStream(sock.getOutputStream() ); // とりあえず改行を2つ読み飛ばす for(i = 0; i < 2;++i) System.out.println(in.readLine() ); @@ -61,7 +60,7 @@ try{ int n = infile.read(buff); System.out.write(buff, 0, n); - dout.write(buff,0,n) ; + dostr.write(buff,0,n) ; } catch(Exception e){ cont = false ; diff --git a/src/j3/Telnet.java b/src/j3/Telnet.java index fcc0bfc..fcea195 100644 --- a/src/j3/Telnet.java +++ b/src/j3/Telnet.java @@ -26,13 +26,17 @@ // while (cont) { try { - int n = System.in.read(buff); + int n = din.read(buff); + if (n > 0) { + System.out.println(n); + System.out.write(buff, 0, n) ; + System.out.flush(); + } + + n = System.in.read(buff); // System.out.println(new String(buff)); if(buff[0] == '.') cont = false ; else outstr.write(buff,0,n) ; - - int dn = din.read(buff); - System.out.println(dn+" "+new String(buff)); } // 以下は例外処理です catch(Exception e){ @@ -44,12 +48,7 @@ cont = true ; while (cont) { try { - int n = din.read(buff); - if (n > 0) { - System.out.println(n); - System.out.write(buff, 0, n) ; - System.out.flush(); - } + } catch(Exception e){ // 読み出し終了時にループも終了